From 4bc8ee6f496643abc54767925212cf5863c6211b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <140248955+xiaohu2002@users.noreply.github.com> Date: Wed, 26 Feb 2025 17:14:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7=E7=8A=B6=E6=80=81=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#290)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 更新内容： 1.條复网盘应用移动端部分情况下目录权限不正确问题 2.修复一些已知问题 3. 优化btn按钮交互效果 4.升级1avui至v2.9.23版本 * 修复一些已知问题 --- admin/appmarket/cp.php | 1 + admin/cloud/edit.php | 1 + admin/cloud/movetool.php | 1 + admin/member/verifyset.php | 1 + admin/setting/mailcheck.php | 1 + core/class/io/io_ALIOSS.php | 1 + core/class/io/io_QCOS.php | 1 + core/class/io/io_disk.php | 1 + core/class/io/io_ftp.php | 1 + core/class/io/io_qiniu.php | 1 + core/class/table/table_user_status.php | 21 +++++++++++++++++++++ dzz/comment/ajax.php | 1 + dzz/dzzvote/ajax.php | 2 ++ dzz/explorer/dynamic.php | 2 ++ dzz/explorer/mobile/collect.php | 1 + dzz/explorer/mobile/recent.php | 2 +- dzz/orguser/edituser.php | 6 ++++-- dzz/orguser/import.php | 4 +++- dzz/shares/ajax.php | 1 + user/profile/index.php | 1 + user/profile/template/lyear/profile.htm | 4 +++- user/profile/template/profile.htm | 2 ++ 22 files changed, 52 insertions(+), 5 deletions(-) diff --git a/admin/appmarket/cp.php b/admin/appmarket/cp.php index 2d0ebff..b34ce22 100644 --- a/admin/appmarket/cp.php +++ b/admin/appmarket/cp.php @@ -74,6 +74,7 @@ elseif ($do == 'import') {//导入应用 $navtitle=lang('import_type_app').' - '.lang('appname'); if (!submitcheck('importsubmit')) { include template('import'); + exit(); } else { $apparray = getimportdata('Dzz! app'); if ($apparray['app']['identifier']) { diff --git a/admin/cloud/edit.php b/admin/cloud/edit.php index 76d6002..8b3c3d3 100644 --- a/admin/cloud/edit.php +++ b/admin/cloud/edit.php @@ -54,6 +54,7 @@ if($_GET['do']=='usercloud'){ } $multi=multi($count, $perpage, $page, $theurl,'pull-right'); include template('edit'); + exit(); } }elseif($_GET['do']=='getBucket'){ $id=$_GET['id']; diff --git a/admin/cloud/movetool.php b/admin/cloud/movetool.php index 37dc08b..d1f4422 100644 --- a/admin/cloud/movetool.php +++ b/admin/cloud/movetool.php @@ -48,6 +48,7 @@ if(submitcheck('movesubmit')){ } $first['fsize']=formatsize($first['filesize']); include template('movetool_run'); + exit(); }else{ $spaces=array(); foreach(C::t('local_storage')->fetch_all_orderby_disp() as $key=>$value){ diff --git a/admin/member/verifyset.php b/admin/member/verifyset.php index c6b0196..3307bd4 100644 --- a/admin/member/verifyset.php +++ b/admin/member/verifyset.php @@ -95,6 +95,7 @@ if ($do == 'edit') { showmessage('members_verify_save_success', ADMINSCRIPT . '?mod=member&op=verifyset', array(), array('alert' => 'right')); } include template('verifyset_edit'); + exit(); } else { if (!submitcheck('verifysubmit')) { for ($i = 1; $i < 8; $i++) { diff --git a/admin/setting/mailcheck.php b/admin/setting/mailcheck.php index a7021e8..00c6550 100644 --- a/admin/setting/mailcheck.php +++ b/admin/setting/mailcheck.php @@ -14,6 +14,7 @@ if(!submitcheck('mailchecksubmit')) { $op = isset($_GET['op']) ? $_GET['op'] : ''; $navtitle=lang('email_send_test').' - '.lang('appname'); include template('mailcheck'); + exit(); }else{ if(!is_array($_G['setting']['mail'])) { $_G['setting']['mail'] = dunserialize($_G['setting']['mail']); diff --git a/core/class/io/io_ALIOSS.php b/core/class/io/io_ALIOSS.php index c40fdd5..7aa9a8e 100644 --- a/core/class/io/io_ALIOSS.php +++ b/core/class/io/io_ALIOSS.php @@ -216,6 +216,7 @@ class io_ALIOSS extends io_api } }else{ include template('oauth_ALIOSS'); + exit(); } } public function getBzByPath($path){ diff --git a/core/class/io/io_QCOS.php b/core/class/io/io_QCOS.php index 0f1b9fb..93870a2 100644 --- a/core/class/io/io_QCOS.php +++ b/core/class/io/io_QCOS.php @@ -295,6 +295,7 @@ class io_Qcos extends io_api } } else { include template('oauth_qcos'); + exit(); } } diff --git a/core/class/io/io_disk.php b/core/class/io/io_disk.php index 4fff63c..3ba6d66 100644 --- a/core/class/io/io_disk.php +++ b/core/class/io/io_disk.php @@ -144,6 +144,7 @@ class io_disk extends io_api }else{ include template('oauth_disk'); + exit(); } } public function parsePath($path){ diff --git a/core/class/io/io_ftp.php b/core/class/io/io_ftp.php index d5a2ae1..1bcef3c 100644 --- a/core/class/io/io_ftp.php +++ b/core/class/io/io_ftp.php @@ -149,6 +149,7 @@ class io_ftp extends io_api }else{ include template('oauth_ftp'); + exit(); } } public function parsePath($path){ diff --git a/core/class/io/io_qiniu.php b/core/class/io/io_qiniu.php index 11b6190..7988f0c 100644 --- a/core/class/io/io_qiniu.php +++ b/core/class/io/io_qiniu.php @@ -200,6 +200,7 @@ class io_qiniu extends io_api } }else{ include template('oauth_qiniu'); + exit(); } } public function getBzByPath($path){ diff --git a/core/class/table/table_user_status.php b/core/class/table/table_user_status.php index fc54d32..31e8abd 100644 --- a/core/class/table/table_user_status.php +++ b/core/class/table/table_user_status.php @@ -104,6 +104,27 @@ class table_user_status extends dzz_table } return $data; } + + public function update($uid, $setarr, $data = false, $low_priority = false) { + if(!$uid || !is_array($setarr) || !$setarr) { + return false; + } + if(DB::result_first("select COUNT(*) from %t where uid=%d",array('user_status',$uid))){ + DB::update($this->_table, $setarr, array('uid'=>$uid)); + }else{ + $status = array( + 'uid' => $uid, + 'regip' => $setarr['regip'] ? $setarr['regip'] : '', + 'lastip' => $setarr['lastip'] ? $setarr['lastip'] : '', + 'lastvisit' => $setarr['lastvisit'] ? $setarr['lastvisit'] : TIMESTAMP, + 'lastactivity' => $setarr['lastactivity'] ? $setarr['lastactivity'] : TIMESTAMP, + 'lastsendmail' => $setarr['lastsendmail'] ? $setarr['lastsendmail'] : 0, + 'invisible' => $setarr['invisible'] ? $setarr['invisible'] : 0, + 'profileprogress' => $setarr['profileprogress'] ? $setarr['profileprogress'] : 0, + ); + DB::insert('user_status',$status,1); + } + } } ?> diff --git a/dzz/comment/ajax.php b/dzz/comment/ajax.php index 2c6b680..534bf05 100644 --- a/dzz/comment/ajax.php +++ b/dzz/comment/ajax.php @@ -206,6 +206,7 @@ function atreplacement($matches) { } if ($template == '1') { include template('lyear_ajax','lyear'); + exit(); } else { include template('ajax'); } diff --git a/dzz/dzzvote/ajax.php b/dzz/dzzvote/ajax.php index 51129ef..6f046aa 100644 --- a/dzz/dzzvote/ajax.php +++ b/dzz/dzzvote/ajax.php @@ -104,6 +104,7 @@ if ($_GET['do'] == 'imageUpload') { $theurl = DZZSCRIPT . '?mod=dzzvote&op=ajax&do=getvoteuser&template='.$template.'&voteid=' . $voteid . '&page=' . $nextpage; if ($template == '1') { include template('lyear_vote_user','lyear'); + exit(); } else { include template('vote_user'); } @@ -162,6 +163,7 @@ if ($_GET['do'] == 'imageUpload') { //error_reporting(E_ALL); if ($template == '1') { include template('lyear_vote_ajax','lyear'); + exit(); } else { include template('vote_ajax'); } diff --git a/dzz/explorer/dynamic.php b/dzz/explorer/dynamic.php index a7f2667..2c73a2f 100644 --- a/dzz/explorer/dynamic.php +++ b/dzz/explorer/dynamic.php @@ -213,6 +213,7 @@ if ($do == 'getfolderdynamic') { } if ($tplmore) {//加载多条动态 include template('template_dynamic_list'); + exit(); } else {//加载单独动态页 include template('template_more_dynamic'); } @@ -235,6 +236,7 @@ if ($do == 'getfolderdynamic') { $versions = C::t('resources_version')->fetch_all_by_rid($rid, $limit, false); if ($vstart == 0) {//加载多条历史版本 include template('historyversion_content'); + exit(); } else {//加载单独历史版本页 include template('template_historyversion_list'); } diff --git a/dzz/explorer/mobile/collect.php b/dzz/explorer/mobile/collect.php index 8224368..5ab3efa 100644 --- a/dzz/explorer/mobile/collect.php +++ b/dzz/explorer/mobile/collect.php @@ -110,6 +110,7 @@ if($operation == 'filelist'){ ); $return = json_encode($return); include template('mobile/filelist'); + exit(); }elseif($operation == 'canclecollect'){//取消收藏 $rids = isset($_GET['rids'])?$_GET['rids']:''; $return = C::t('resources_collect')->delete_usercollect_by_rid($rids); diff --git a/dzz/explorer/mobile/recent.php b/dzz/explorer/mobile/recent.php index 2716081..e3865c9 100644 --- a/dzz/explorer/mobile/recent.php +++ b/dzz/explorer/mobile/recent.php @@ -91,7 +91,7 @@ if($operation == 'filelist'){ $return = json_encode($return); $return = str_replace("'","\'",$return); include template('mobile/filelist'); - + exit(); }else{ include template('mobile/recent'); } \ No newline at end of file diff --git a/dzz/orguser/edituser.php b/dzz/orguser/edituser.php index e2080e0..9db47b6 100644 --- a/dzz/orguser/edituser.php +++ b/dzz/orguser/edituser.php @@ -143,7 +143,7 @@ if ($do == 'add') { C::t('organization_user') -> replace_orgid_by_uid($uid, $orgids); //处理上司职位; C::t('organization_upjob') -> insert_by_uid($uid, intval($_GET['upjobid'])); - Hook::listen('syntoline_user',$uid);//注册绑定到钉钉部门表 + Hook::listen('syntoline_user',$uid,'add');//注册绑定到钉钉部门表 if ($_GET['sendmail']) { $email_password_message = lang('email_password_message', array('sitename' => $_G['setting']['sitename'], 'siteurl' => $_G['siteurl'], 'email' => $_GET['email'], 'password' => $_GET['password'])); @@ -166,6 +166,7 @@ if ($do == 'add') { } include template('adduser'); + exit(); } } elseif ($do == 'edit') { @@ -307,7 +308,7 @@ if ($do == 'add') { //处理上司职位; C::t('organization_upjob') -> insert_by_uid($uid, intval($_GET['upjobid'])); - Hook::listen('syntoline_user',$uid);//注册绑定到钉钉部门表 + Hook::listen('syntoline_user',$uid,'edit');//注册绑定到钉钉部门表 showmessage('edit_user_success', MOD_URL.'#user_' . $uid, array()); } else { require_once libfile('function/organization'); @@ -364,6 +365,7 @@ if ($do == 'add') { } include template('edituser'); + exit(); } } elseif ($do == 'profile') { diff --git a/dzz/orguser/import.php b/dzz/orguser/import.php index ed25fd6..9d4c9ba 100644 --- a/dzz/orguser/import.php +++ b/dzz/orguser/import.php @@ -367,7 +367,8 @@ if($do=='importing'){ $open[$arr[$count-1]]=$arr; } $openarr=json_encode(array('orgid'=>$open)); - include template('import_list'); + include template('import_list'); + exit(); }else{ if(submitcheck('importfilesubmit')){ if($_FILES['importfile']['tmp_name']){ @@ -388,6 +389,7 @@ if($do=='importing'){ }else{ include template('import_guide'); + exit(); } } function checkprofile($fieldid,&$value){ diff --git a/dzz/shares/ajax.php b/dzz/shares/ajax.php index 9731f7a..fbd3db5 100644 --- a/dzz/shares/ajax.php +++ b/dzz/shares/ajax.php @@ -147,6 +147,7 @@ if (count($list) >= $perpage) { } if($_G['ismobile']){ include template('mobile/list_item'); + exit(); }else{ include template('list_item'); } diff --git a/user/profile/index.php b/user/profile/index.php index 0f1a0b6..238da72 100644 --- a/user/profile/index.php +++ b/user/profile/index.php @@ -16,6 +16,7 @@ $uid = intval($_G['uid']); $verify = C::t('user_verify')->fetch($_G['uid']);//验证信息 $space = C::t('user_profile')->get_userprofile_by_uid($uid);//用户资料信息 $userstatus = C::t('user_status')->fetch($uid);//用户状态 +$userstatus['profileprogress'] = $userstatus['profileprogress'] ? $userstatus['profileprogress'] : 0; $users = getuserbyuid($uid); //$qqlogin = DB::fetch_first("select openid,unbind from %t where uid=%d", array('user_qqconnect', $uid)); diff --git a/user/profile/template/lyear/profile.htm b/user/profile/template/lyear/profile.htm index b5f0f19..ef0f58c 100644 --- a/user/profile/template/lyear/profile.htm +++ b/user/profile/template/lyear/profile.htm @@ -73,7 +73,7 @@
- {lang Information_complete} $userstatus[profileprogress]% + {lang Information_complete} {$userstatus[profileprogress]}%
@@ -97,11 +97,13 @@
$_G[username]
+
+
diff --git a/user/profile/template/profile.htm b/user/profile/template/profile.htm index 7a9f769..8da271a 100644 --- a/user/profile/template/profile.htm +++ b/user/profile/template/profile.htm @@ -136,10 +136,12 @@ html,body{

$_G[username]    {lang do_unbind}

+

+