he/DzzOffice
1
0
Fork 0
mirror of https://github.com/DzzXH/DzzOffice.git synced 2026-01-15 11:55:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

更新至v1.87.4，更新内容在Dzzoffice笔记中查看

Browse Source
This commit is contained in:
小胡
2024-03-16 17:33:16 +08:00
Unverified
parent dfa31fd1a1
commit f1db1c02da
30 changed files with 73 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
admin/appmarket/install_app_ajax.php
View File

@@ -164,7 +164,6 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["status"]=0;
$return["msg"]=lang('upgrade_close_site') ;
exit(json_encode($return));
exit();
}
$step = intval($_REQUEST['step']);
@@ -196,8 +195,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["url"]=$linkurl;
$return["msg"]="应用文件即将下载...";
$return["step"]=2;
exit(json_encode($return));
exit;
exit(json_encode($return));
}
elseif($step == 2) {
@@ -240,8 +238,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
} else {
$return["status"]=0;
$return["msg"]= lang('app_upgrade_downloading_error', array('file' => $updatefilelist[$fileseq-1], 'upgradeurl'=>upgradeinformation_app(-3) )) ;
exit(json_encode($return));
exit;
exit(json_encode($return));
}
$msg = lang('upgrade_downloading_file', array('file' => $updatefilelist[$fileseq - 1], 'percent' =>$percent. '%' ,'upgradeurl'=>'')) ;
}
@@ -249,8 +246,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["url"]=$linkurl;
$return["percent"]=intval(50*$percent/100);
$return["second"]=1;
exit(json_encode($return));
exit;
exit(json_encode($return));
}
elseif($step == 3) {
$return["percent"]=55;
@@ -273,8 +269,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
$linkurl = $theurl.'&step=4';
$return["url"]=$linkurl;
exit(json_encode($return));
exit;
exit(json_encode($return));
}
elseif($step==4){
$return["percent"]=80;
@@ -361,8 +356,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["percent"]=75;
$return["second"]=1;
$return["msg"]= lang('app_upgrade_move_success', array( 'upgradeurl' => upgradeinformation_app(4)));
exit(json_encode($return));
exit();
exit(json_encode($return));
}
if($_GET['dodabase']){
@@ -422,7 +416,6 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["step"]=5;
$return["msg"]= lang("app_upgrade_install_will_success");
exit(json_encode($return));
exit;
}
$linkurl = ADMINSCRIPT . '?mod=appmarket&op=install_app_ajax&operation=' . $operation . '&appid=' .$appid. '&step=5';
@@ -432,7 +425,6 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["step"]=5;
$return["msg"]=lang("app_upgrade_install_will_success");
exit(json_encode($return));
exit;
}
elseif($step==5){
//判断如果是网址类型删除对应目录

1
admin/appmarket/language/zh-cn/lang.php
View File

@@ -1,7 +1,6 @@
<?php
$lang = array (
'appmarket' => '应用市场',
'installed' => '已安装',
'upgrade' => '升级',
'open_way'=>'打开方式',
'permission_management'=>'权限管理',

30
admin/appmarket/upgrade_app_ajax.php
View File

@@ -112,7 +112,6 @@ elseif($operation == 'upgrade' ){
$return["status"]=0;
$return["msg"]= lang("app_upgrade_newversioninfo_error");
exit(json_encode($return));
exit;
}
$version =$appinfo["version"];
@@ -189,8 +188,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
$msg .= "</script></p>";
$return["status"]=0;
$return["msg"]=lang('upgrade_close_site') ;
exit(json_encode($return));
exit();
exit(json_encode($return));
}
$step = intval($_REQUEST['step']);
@@ -209,7 +207,6 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["status"]=0;
$return["msg"]= lang( "app_upgrade_data_error" );
exit(json_encode($return));
exit;
}
$appinfo["app_path_old"]=$appinfo["app_path"];
$appinfo["identifier_old"]=$appinfo["identifier"];
@@ -276,8 +273,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["url"]=$linkurl;
$return["msg"]= lang('app_upgrade_already_downloadfile' );
$return["step"]=2;
exit(json_encode($return));
exit;
exit(json_encode($return));
}
elseif($step == 2) {
@@ -322,8 +318,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
} else {
$return["status"]=0;
$return["msg"]= lang('app_upgrade_downloading_error', array('file' => $updatefilelist[$fileseq-1], 'upgradeurl'=>upgradeinformation_app(-3) )) ;
exit(json_encode($return));
exit;
exit(json_encode($return));
}
$msg = lang('app_upgrade_downloading_file', array('file' => $updatefilelist[$fileseq - 1], 'percent' =>$percent. '%','upgradeurl'=>'')) ;
}
@@ -331,8 +326,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["url"]=$linkurl;
$return["percent"]=intval(50*$percent/100);
$return["second"]=1;
exit(json_encode($return));
exit;
exit(json_encode($return));
}
elseif($step == 3) {
$return["percent"]=55;
@@ -370,8 +364,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
$linkurl = $theurl.'&step=4';
$return["url"]=$linkurl;
exit(json_encode($return));
exit;
exit(json_encode($return));
}
elseif($step==4){
$return["percent"]=80;
@@ -419,8 +412,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["second"]=0;
$return["msg"]= lang('app_upgrade_backuping', array('upgradeurl' => upgradeinformation(2))) ;
$return["step"]=4;
exit(json_encode($return));
exit();
exit(json_encode($return));
}
foreach ($updatefilelist as $updatefile) {
$destfile = DZZ_ROOT .$appinfo['app_path_old'].'/' . $appinfo['identifier_old'].'/'.$updatefile;
@@ -439,8 +431,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["percent"]=60;
$return["second"]=300;
$return["msg"]=lang('app_upgrade_backup_complete', array('upgradeurl' => upgradeinformation(3))) ;
exit(json_encode($return));
exit();
exit(json_encode($return));
}
if(!$_GET['fileupgrade']) {
@@ -470,8 +461,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["percent"]=75;
$return["second"]=2000;
$return["msg"]=lang('app_upgrade_file_success', array( 'upgradeurl' => upgradeinformation_app(4)));
exit(json_encode($return));
exit();
exit(json_encode($return));
}
if($_GET['dodabase']){
@@ -533,8 +523,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["second"]=300;
$return["step"]=5;
$return["msg"]=lang('app_upgrade_database_success', array( 'upgradeurl' => upgradeinformation_app(5)));
exit(json_encode($return));
exit;
exit(json_encode($return));
}
$linkurl = MOD_URL.'&op=upgrade_app_ajax&operation=' . $operation . '&appid=' .$appid. '&step=5&confirm=' . $confirm;
@@ -545,7 +534,6 @@ elseif($operation == 'cross' || $operation == 'patch'){
$return["step"]=5;
$return["msg"]=lang('app_upgrade_newversion_will_success');
exit(json_encode($return));
exit;
}
elseif($step==5){
//删除更新文件列表tmp临时文件

1
admin/function/function_admin.php
View File

@@ -300,7 +300,6 @@ function upgradeinformation_app($status = 0) {
$update['uniqueid'] = $siteuniqueid;
$update['mid'] = $mid;
$update['curversion'] = $appinfo['version'];
$update['lastversion'] = $lastversion;
$update['identifier'] = $appinfo['identifier'];
$update['lastversion'] = $lastversion;
$update['status'] = $status;

22
admin/language/en-US/lang.php
View File

@@ -273,7 +273,6 @@ $lang = array
'thread' => 'thread',
'subject' => 'title ',
'nosubject' => 'no title ',
'message' => 'content ',
'mergeto' => 'merge into ',
'doings' => 'records ',
'blogs' => 'logs',
@@ -644,9 +643,6 @@ $lang = array
'oauth_JSS_bucket'=>' Select the bucket you want to use, click the link on the left to automatically get the bucket list, if you do not have a bucket, please create a bucket first ',
'oauth_JSS_bucket_success'=>'bucket successfully obtained, please select ',
// admin/cloud/template/oauth_qinniu.html
'oauth_JSS_add_JD'=>' add JD.com ',
'oauth_JSS_JD_storage'=>' JD cloud storage',
'add_oauth_JSS_JD_storage'=>' add JD cloud storage',
'oauth_qinniu_add'=>' Add Qiuyun ',
'oauth_qinniu_set'=>' Set the Seven cow clouds ',
'oauth_qinniu_storage'=>' Qiniu cloud storage',
@@ -654,7 +650,6 @@ $lang = array
'oauth_qinniu_storage_bucket'=>' Enter the access domain name of the bucket entered above in Qiniu cloud Storage. ',
'storage_region'=>' storage region',
'oauth_qinniu_storage_region'=>' Please select a storage region. ',
'oauth_JSS_bucket_success'=>'bucket successfully obtained, please select ',
// admin/cloud/template/router.html
'priority'=>' priority',
'use_storage'=>' use storage',
@@ -1091,17 +1086,7 @@ $lang = array
'import_volume_classification2'=>' failed! The database structure may be damaged! Please try importing from Volume 1 ',
'volume_classification_success'=>'All the sub volume backups were imported successfully！<br />',
'jurisdiction' => 'permissions',
'folder_permission_name'=>' folder permission name',
'edit_folder_permissions'=>' Edit folder permissions',
'file_multiple_version_features'=>' file multiversion Settings ',
'allow_number_uploaded_versions'=>' maximum number of versions',
'allow_number_uploaded_versions_tip'=>' Control the number of file versions, the default value is 0, which means no limit on the number of versions ',
'setSystemSpace'=>' system space Settings ',
'setSystemSpace_tip'=>' Set the size of system space, if left blank or 0, the space is unlimited, if -1, no storage space ',
'space_organization_set'=>' Organization storage setting ',
'support_upload_pictures_extensions'=>' Sorry, we don’t support uploading pictures with such extension ',
'upload_await'=>' upload, please wait',
'folder_permissions'=>' Folder permissions',
@@ -1121,22 +1106,15 @@ $lang = array
'delete_permission_group_sure'=>' Are you sure you want to delete the permission group? Unrecoverable after deletion ',
'space_group_set'=>' group storage space setting ',
'space_group_set_tip'=>' Set the default group space size. If left blank or 0, all system space is shared. If -1, no storage space is available. ',
'jurisdiction' => 'permissions',
'folder_permission_name'=>' folder permission name',
'edit_folder_permissions'=>' Edit folder permissions',
'file_multiple_version_features'=>' file multiversion Settings ',
'allow_number_uploaded_versions'=>' maximum number of versions',
'allow_number_uploaded_versions_tip'=>' Control the number of file versions, the default value is 0, which means no limit on the number of versions ',
'setSystemSpace'=>' system space Settings ',
'setSystemSpace_tip'=>' Set the size of system space, if left blank or 0, the space is unlimited, if -1, no storage space ',
'space_organization_set'=>' Organization storage setting ',
'space_organization_set_tip'=>' Sets the default organization space size. If left blank or 0, all system space is shared, if -1, no storage space is available ',
'space_group_set'=>' group storage space setting ',
'space_group_set_tip'=>' Set the default group space size. If left blank or 0, all system space is shared. If -1, no storage space is available. ',
'open_qq_login'=>' Whether to open QQ login',
'qq_app_id'=>' APP ID applied in QQ interconnection ',
'qq_app_key'=>' Application APP KEY applied in QQ interconnection ',

1
admin/language/zh-cn/lang.php
View File

@@ -274,7 +274,6 @@ $lang = array
'thread' => '帖子',
'subject' => '标题',
'nosubject' => '无标题',
'message' => '内容',
'mergeto' => '合并到',
'doings' => '记录',
'blogs' => '日志',

1
admin/setting/language/en-US/lang.php
View File

@@ -18,7 +18,6 @@ $lang = array
'loginSet'=>' Login Settings ',
'basicSet'=>' Basic Settings ',
'permGroupSet'=>' permission package set ',
'spaceSet'=>' Space setup ',
'sitelogo' =>' platform LOGO',
'default_app'=>' default homepage ',
'Notification Settings'=>'Notification Settings',

1
admin/setting/language/zh-cn/lang.php
View File

@@ -18,7 +18,6 @@ $lang = array
'loginSet'=>'登录设置',
'basicSet'=>'基本设置',
'permGroupSet'=>'权限包设置',
'spaceSet'=>'空间设置',
'sitelogo' =>'平台LOGO',
'default_app'=>'默认首页',
'Notification Settings'=>'通知设置',

1
admin/systemlog/index.php
View File

@@ -131,7 +131,6 @@ if($type=="list"){
$log[2] = $log[2];
$log[2] = ($log[2] != $_G['member']['username'] ? "<b>$log[2]</b>" : $log[2]);
$log[3] = $usergroup[$log[3]];
$list[$k]=$log;
}
$multipage = multi($count, $lpp, $page, $theurl,'pull-right');

1
admin/systemlog/language/zh-cn/lang.php
View File

@@ -5,7 +5,6 @@ $lang = array (
'systemlog_setting'=>'设置',
'systemlog_list'=>'日志列表',
'logswitch'=>'日志开关',
'logtype'=>'日志类型',
'logtypename'=>'日志类型名称',
'logtype'=>'日志类型',
'logflag'=>'日志标识',

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

@@ -151,7 +151,6 @@ class dzz_app extends dzz_base{
'PHP_SELF' => '',
'siteurl' => '',
'localurl' => '',
'siteroot' => '',
'siteport' => '',

9
core/class/io/io_dzz.php
View File

@@ -148,7 +148,7 @@ class io_dzz extends io_api
Hook::listen('io_dzz_getstream_attach',$icoarr);//挂载点
$bz = io_remote::getBzByRemoteid($icoarr['remote']);
if ($bz == 'dzz') {
if ($icoarr['type'] == 'video' || $icoarr['type'] == 'dzzdoc' || $icoarr['type'] == 'link') {
if ($icoarr['type'] == 'video' || $icoarr['type'] == 'link') {
return $icoarr['url'];
}
return $_G['setting']['attachdir'] . $icoarr['attachment'];
@@ -169,7 +169,7 @@ class io_dzz extends io_api
Hook::listen('io_dzz_getstream_attach',$icoarr);//挂载点
$bz = io_remote::getBzByRemoteid($icoarr['remote']);
if ($bz == 'dzz') {
if ($icoarr['type'] == 'video' || $icoarr['type'] == 'dzzdoc' || $icoarr['type'] == 'link') {
if ($icoarr['type'] == 'video' || $icoarr['type'] == 'link') {
return $icoarr['url'];
}
@@ -211,7 +211,7 @@ class io_dzz extends io_api
Hook::listen('io_dzz_getstream_attach',$icoarr);//挂载点
$bz = io_remote::getBzByRemoteid($icoarr['remote']);
if ($bz == 'dzz') {
if ($icoarr['type'] == 'video' || $icoarr['type'] == 'dzzdoc' || $icoarr['type'] == 'link') {
if ($icoarr['type'] == 'video' || $icoarr['type'] == 'link') {
return $icoarr['url'];
}
return $_G['siteurl'] . $_G['setting']['attachurl'] . $icoarr['attachment'];
@@ -1652,7 +1652,7 @@ class io_dzz extends io_api
return array('error' => lang('file_not_exist1'));
}
$gid = DB::result_first("select gid from %t where fid=%d", array('folder', $icoarr['pfid']));
if (in_array($icoarr['type'], array('folder', 'link', 'video', 'dzzdoc'))) {
if (in_array($icoarr['type'], array('folder', 'link', 'video'))) {
if (!perm_check::checkperm_Container($icoarr['pfid'], 'upload')) {
return array('error' => lang('privilege'));
}
@@ -1802,7 +1802,6 @@ class io_dzz extends io_api
if ($icoarr['rid'] = C::t('resources')->insert_data($icoarr)) {
$sourceattr = array(
'title' => $attach['filename'],
'desc' => '',
'postip' => $_G['clientip'],
'desc' => $data['desc'],
'aid' => $data['aid'],

14
core/class/memory/memory_driver_memcache.php
View File

@@ -8,6 +8,7 @@ class memory_driver_memcache
{
public $enable;
public $obj;
public function init($config) {
if(!empty($config['server'])) {
@@ -19,10 +20,19 @@ class memory_driver_memcache
$connect = @$this->obj->connect($config['server'], $config['port']);
}
$this->enable = $connect ? true : false;
$this->enable = $this->checkEnable($connect);
}
}
public function checkEnable($connect){
if($connect){
$this->set('_check_','_check_',10);
if($this->get('_check_')=='_check_'){
return true;
}
$this->rm('_check_');
}
return false;
}
public function get($key) {
return $this->obj->get($key);
}

17
core/class/memory/memory_driver_memcached.php
View File

@@ -12,9 +12,22 @@ class memory_driver_memcached
public function init($config) {
if(!empty($config['server'])) {
$this->obj = new Memcached();
$connect = $this->connectd($config['server'], $config['port']);
$this->enable = $connect ? true : false;
$this->enable=$this->checkEnable($connect);
}
}
public function checkEnable($connect){
if($connect){
$this->set('_check_','_check_',10);
if($this->get('_check_')=='_check_'){
return true;
}
$this->rm('_check_');
}
return false;
}
public function connectd($host , $port){
$servers = $this->obj->getServerList();
@@ -30,7 +43,7 @@ class memory_driver_memcached
}
public function getMulti($keys) {
return $this->obj->get($keys);
return $this->obj->getMulti($keys);
}
public function set($key, $value, $ttl = 0) {
return $this->obj->set($key, $value, $ttl);

13
core/class/memory/memory_driver_redis.php
View File

@@ -20,7 +20,7 @@ class memory_driver_redis
} catch (RedisException $e) {
echo $e;
}
$this->enable = $connect ? true : false;
$this->enable = $this->checkEnable($connect);
if($this->enable) {
if($config['requirepass']) {
$this->obj->auth($config['requirepass']);
@@ -29,7 +29,16 @@ class memory_driver_redis
}
}
}
public function checkEnable($connect){
if($connect){
$this->set('_check_','_check_',10);
if($this->get('_check_')=='_check_'){
return true;
}
$this->rm('_check_');
}
return false;
}
function &instance() {
static $object;
if(empty($object)) {

11
core/class/table/table_resources.php
View File

@@ -396,9 +396,6 @@ class table_resources extends dzz_table
} elseif ($data['type'] == 'shortcut') {
$data['ttype'] = $data['tdata']['type'];
$data['ext'] = $data['tdata']['ext'];
} elseif ($data['type'] == 'dzzdoc') {
$data['url'] = DZZSCRIPT . '?mod=document&icoid=' . dzzencode('attach::' . $data['aid']);
$data['img'] = isset($data['img']) ? $data['img'] : geticonfromext($data['ext'], $data['type']);
} elseif ($data['type'] == 'folder') {
//$contaions = self::get_contains_by_fid($data['oid'], true);
//$data['contaions'] = $contaions;
@@ -872,6 +869,11 @@ class table_resources extends dzz_table
$fileinfo['opendateline'] = ($filestatis['opendateline']) ? dgmdate($filestatis['opendateline'], 'Y-m-d H:i:s') : dgmdate($fileinfo['dateline'], 'Y-m-d H:i:s');
$fileinfo['editdateline'] = ($filestatis['editdateline']) ? dgmdate($filestatis['editdateline'], 'Y-m-d H:i:s') : dgmdate($fileinfo['dateline'], 'Y-m-d H:i:s');
$fileinfo['fdateline'] = dgmdate($fileinfo['dateline'], 'Y-m-d H:i:s');
if ($_G['adminid']) {
$fileinfo['downs'] = $filestatis['downs'];
$fileinfo['views'] = $filestatis['views'];
$fileinfo['edits'] = $filestatis['edits'];
}
//编辑权限信息
$fileinfo['editperm'] = 1;
if ($fileinfo['gid'] > 0) {
@@ -1029,9 +1031,6 @@ function get_icosinfo_by_rid($rid)
$data['img'] = geticonfromext($data['ext'], $data['type']);
} elseif ($data['type'] == 'shortcut') {
$data['img'] = isset($data['tdata']['img']) ? $data['tdata']['img'] : geticonfromext($data['tdata']['ext'], $data['tdata']['type']);
} elseif ($data['type'] == 'dzzdoc') {
$data['img'] = isset($data['img']) ? $data['img'] : geticonfromext($data['ext'], $data['type']);
} elseif ($data['type'] == 'folder') {
$data['img'] = $data['img']?$data['img']:'dzz/images/default/system/'.$data['flag'].'.png';
} else {

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

@@ -19,8 +19,6 @@ class table_resources_version extends dzz_table
$data['img']=DZZSCRIPT.'?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$data['aid']);
}elseif($data['type']=='attach' || $data['type']=='document'){
$data['img']=geticonfromext($data['ext'],$data['type']);
}elseif($data['type']=='dzzdoc'){
$data['img']=isset($data['img'])?$data['img']:geticonfromext($data['ext'],$data['type']);
}else{
$data['img']=isset($data['img'])?$data['img']:geticonfromext($data['ext'],$data['type']);
}

1
core/class/table/table_user.php
View File

@@ -39,6 +39,7 @@ class table_user extends dzz_table
$setarr=array(
'username'=>addslashes($userArr['username']),
'email'=>isset($userArr['email']) ? $userArr['email']:'' ,
'phone'=>isset($userArr['phone']) ? $userArr['phone']:'' ,
'salt'=>$salt,
'password'=>md5(md5($userArr['password']).$salt),
'regdate'=>TIMESTAMP,

1
core/class/table/table_user_setting.php
View File

@@ -51,7 +51,6 @@ class table_user_setting extends dzz_table
if(!$uid)$uid = getglobal('uid');
if(!DB::update($this->_table,array('svalue'=>$val),array('uid'=>$uid,'skey'=>$skey))){
$setarr=array('uid'=>$uid,
'uid'=>$uid,
'skey'=>$skey,
'svalue'=>$val
);

4
core/core_version.php
View File

@@ -14,7 +14,7 @@ if(!defined('CORE_VERSION')) {
define('CORE_VERSION', '2.02');
define('CORE_RELEASE', '20180909');
define('CORE_FIXBUG' , '20000000');
define('CORE_XHVERSION', '1.87.3');
define('CORE_XHRELEASE', '20240129');
define('CORE_XHVERSION', '1.87.4');
define('CORE_XHRELEASE', '20240316');
define('CORE_XHFIXBUG' , '20240110');
}

2
core/function/function_core.php
View File

@@ -627,12 +627,10 @@ function isemail($email)
{
return strlen($email) > 6 && strlen($email) <= 32 && preg_match("/^([A-Za-z0-9\-_.+]+)@([A-Za-z0-9\-]+[.][A-Za-z0-9\-.]+)$/", $email);
}
function isphone($phone)
{
return preg_match("/^1[3456789]\d{9,10}$/", $phone);
}
function quescrypt($questionid, $answer)
{
return $questionid > 0 && $answer != '' ? substr(md5($answer . md5($questionid)), 16, 8) : '';

9
dzz/attach/saveto.php
View File

@@ -29,15 +29,6 @@ if($_GET['type']=='link'){
}
if(!preg_match("/^(http|ftp|https|mms)\:\/\/.{4,300}$/i",($link))) topshowmessage(lang('invalid_format_url'));
$icoarr=io_dzz::linktourl($link,$pfid);
}elseif($_GET['type']=='dzzdoc'){
$aid=empty($_GET['aid'])?0:intval($_GET['aid']);
$attach=C::t('attachment')->fetch($aid);
if(!$attach){
topshowmessage(lang('attachment_nonexistence'));
}
if(!empty($_GET['filename'])) $attach['filename']=trim($_GET['filename']);
$icoarr=IO::upload_by_content(IO::getFileContent('attach::'.$attach['aid']),$pfid,(trim($attach['filename'],'.dzzdoc').'.dzzdoc'));
}else{
$aid=empty($_GET['aid'])?0:intval($_GET['aid']);
$attach=C::t('attachment')->fetch($aid);

4
dzz/attach/view.php
View File

@@ -31,10 +31,6 @@ if($_GET['a']=='down'){
$url=$_G['siteurl'].'index.php?mod=sound&path='.$_GET['s'];
@header("Location: $url");
exit();
}elseif($icoarr['type']=='dzzdoc'){
$url=$_G['siteurl'].'index.php?mod=document&icoid='.$_GET['s'];
@header("Location: $url");
exit();
}
$bzarr=explode(':',$icoarr['rbz']?$icoarr['rbz']:$icoarr['bz']);
$bz=$bzarr[0];

8
dzz/filemanage/template/list.htm
View File

@@ -140,9 +140,9 @@
<div>
<a node-type="btn-item" data-key="download" class="btn btn-outline-info" title="下载" href="javascript:void(0);"><i class="dzz dzz-download"></i></a>
<a class="btn btn-outline-info" href="{MOD_URL}&do=delete&icoid=$value[rid]&refer={eval echo urlencode($refer);}" data-bs-toggle="tooltip" title="{lang delete}" onclick="if(confirm('{lang filemanage_del_file}')){return true}else{return false}"><i class="dzz dzz-delete"></i></a>
<!--{if $value[type]=='folder'}--><!--{else}-->
<!--{if $_G[adminid]}--><!--{if $value[type]=='folder'}--><!--{else}-->
<a class="btn btn-outline-info" href="javascript:;" onclick="togglecplog('{$key}')" data-bs-toggle="tooltip" title="更多信息"><i class="dzz dzz-description"></i></a>
<!--{/if}-->
<!--{/if}--><!--{/if}-->
</div>
</td>
<!--{if $value[type]=='folder'}--><!--{else}-->
@@ -155,6 +155,8 @@
直链地址：<a href="<!--{eval echo IO::getFileUri($value[path])}-->"><!--{eval echo IO::getFileUri($value[path])}--></a>
<br/>
引用：$value[copys]
<br/>
是否在回收站：<!--{if $value[isdelete]}-->是<!--{else}-->否<!--{/if}-->
<!--{/if}-->
<!--{/if}--></td>
</tr>
@@ -325,6 +327,7 @@ function delete_file(){
})
}
}
<!--{if $_G[adminid]}-->
function togglecplog(k) {
var cplogobj = document.getElementById('cplog_' + k);
if(cplogobj.style.display == 'none') {
@@ -333,6 +336,7 @@ function togglecplog(k) {
cplogobj.style.display = 'none';
}
}
<!--{/if}-->
</script>
<script type="text/javascript" src="static/lyear/js/bootstrap-lyear-select/bootstrap-lyear-select.js"></script>
<!--{template common/footer_simple}-->

1
dzz/io/getStream.php
View File

@@ -21,7 +21,6 @@ if(!$url=(IO::getStream($path))){
@header('Status: 403 Not Found');
exit(lang('attachment_nonexistence'));
}
$filename=rtrim($_GET['n'],'.dzz');
$ext=strtolower(substr(strrchr($filename, '.'), 1, 10));
if(!$ext) $ext=strtolower(substr(strrchr(preg_replace("/\.dzz$/i",'',preg_replace("/\?.*/i",'',$url)), '.'), 1, 10));

1
dzz/shares/language/zh-cn/lang.php
View File

@@ -11,7 +11,6 @@ $lang = array (
'file_been_deleted'=>'文件已删除',
'change_list'=>'切换列表',
'change_thumbnail'=>'切换缩略图',
'password_share'=>'加密分享',
'password_share_to'=>'给您加密分享了文件',
'password_share_lable'=>'请输入提取密码：',
'password_share_placeholder'=>'请填写提取密码',

2
dzz/shares/template/password.htm
View File

@@ -11,7 +11,7 @@
</div>
<form method="post" action="{$_G[siteurl]}index.php?mod=shares&sid=$osid">
<input type="hidden" name="formhash" value="{FORMHASH}" />
<div class="row mb-3">
<div class="mb-3 has-feedback">
<div class="has-feedback">
<span class="mdi mdi-lock" aria-hidden="true"></span>
<input type="password" placeholder="{lang password_share_placeholder}" class="form-control" id="password" name="password"/>

4
dzz/system/scripts/select-file.js
View File

@@ -495,10 +495,6 @@ _selectfile.Open = function (rid, extid, title) {
if (obj.type === 'link') {
window.open(data.url);
return;
} else if (obj.type === 'dzzdoc') {
obj.url = "index.php?mod=document&icoid=" + obj.id;
window.open(obj.url);
return;
} else if (obj.type === 'folder') {
var hash = '';
var fid = data.oid;

2
static/js/common.js
View File

@@ -1,4 +1,4 @@
/*
/*
* @copyright Leyun internet Technology(Shanghai)Co.,Ltd
* @license http://www.dzzoffice.com/licenses/license.txt
* @package DzzOffice

4
user/function/function_user.php
View File

@@ -17,15 +17,13 @@ function uc_user_login($username, $password, $isuid, $checkques = '', $questioni
$hookdata = array($username, $password, $isuid, $checkques, $questionid,$answer, $ip);
\Hook::listen('applogin', $hookdata);
list($username, $password, $isuid, $checkques, $questionid, $answer, $ip) = $hookdata;
if ($isuid == 1) {
$user = C::t('user')->fetch_by_uid($username);
} elseif ($isuid == 2) {
$user = C::t('user')->fetch_by_email($username);
} elseif ($isuid == 3) {//手机号码登录
$user = C::t('user')->fetch_by_phone($username);
}else {
} else {
$user = C::t('user')->fetch_by_username($username);
}