修复部分情况下无法正常更新用户状态信息问题 (#290)

* 更新内容：
1.條复网盘应用移动端部分情况下目录权限不正确问题
2.修复一些已知问题
3. 优化btn按钮交互效果
4.升级1avui至v2.9.23版本

* 修复一些已知问题

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']) {

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'];

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){

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++) {

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']);

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){

core/class/io/io_QCOS.php

@@ -295,6 +295,7 @@ class io_Qcos extends io_api
             }
         } else {
             include template('oauth_qcos');
+            exit();
         }
     }
 

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){

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){

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){

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);
+		}
+	}
 }
 
 ?>

dzz/comment/ajax.php

@@ -206,6 +206,7 @@ function atreplacement($matches) {
 }
 if ($template == '1') {
 	include template('lyear_ajax','lyear');
+	exit();
 } else {
 	include template('ajax');
 }

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');
 }

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');
     }

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);

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');
 }

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') {

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){

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');
 }

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));
 

user/profile/template/lyear/profile.htm

@@ -73,7 +73,7 @@
       <div class="mb-2">
       	<div class="progress progress-relative" style="margin:0">
           <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="$userstatus[profileprogress]" aria-valuemin="0" aria-valuemax="100" style="width: {$userstatus[profileprogress]}%;min-width: 100px;">
-            <span class="sr-only">{lang Information_complete} $userstatus[profileprogress]% </span>
+            <span class="sr-only">{lang Information_complete} {$userstatus[profileprogress]}% </span>
           </div>
         </div>
       </div>
@@ -97,11 +97,13 @@
           <div class="col-sm-10"><strong><code>$_G[username]</code></strong>
           </div>
         </div>
+        <!--{if $userstatus['lastvisit']}-->
         <div class="row mb-3">
           <label class="col-sm-2">最近在线时间</label>
           <div class="col-sm-10"><strong><code><!--{eval echo dgmdate($userstatus['lastvisit'])}--></code></strong>
           </div>
         </div>
+        <!--{/if}-->
 				<div class="row mb-3">
           <label class="col-sm-2"><!--{if $users[regip]}-->{lang registration_time}<!--{else}-->{lang add_time}<!--{/if}--></label>
           <div class="col-sm-10"><strong><code><!--{eval echo dgmdate($users['regdate'])}--></code></strong>

user/profile/template/profile.htm

@@ -136,10 +136,12 @@ html,body{
             <p class="form-control-static">$_G[username]&nbsp; <!--{if $qqlogin[openid] && $qqlogin[unbind]<1}--><img src="user/images/qq.png" height="16" title="{lang qq_bind}" />&nbsp;&nbsp;<a  href="user.php?mod=profile&action=qq_unbind&openid=$qqlogin[openid]">{lang do_unbind}</a><!--{/if}--></p>
           </div>
         </div>
+        <!--{if $userstatus['lastvisit']}-->
         <div class="form-group">
           <label class="control-label">最近在线时间</label>
            <p class="form-control-static"><!--{eval echo dgmdate($userstatus['lastvisit'])}--></p>
         </div>
+        <!--{/if}-->
 				<div class="form-group">
           <label class="control-label"><!--{if $users[regip]}-->{lang registration_time}<!--{else}-->{lang add_time}<!--{/if}--></label>
            <p class="form-control-static"><!--{eval echo dgmdate($users[regdate])}--></p>