1.46.03 release

Author: kalcaddle

app/controller/explorer/listSearch.class.php

@@ -109,10 +109,14 @@ public function listDataParseShareItem($listData,$parseSearch){
 		if($parseSearch['type'] != KodIO::KOD_SHARE_ITEM) return $listData;
 		$userShare = Action('explorer.userShare');
 		$shareInfo = Model("Share")->getInfo($parseSearch['id']);
+		$pathPre = '{shareItem:';
 		foreach ($listData as $key => $keyList) {
 			if($key != 'folderList' && $key != 'fileList' ) continue;
 			$keyListNew = array();
 			foreach ($keyList as $source){
+				$pathStart = substr($source['path'],0,strlen($pathPre));// 已经处理过
+				if($pathStart == $pathPre){$keyListNew[] = $source;continue;}
+				
 				$source = $userShare->_shareItemeParse($source,$shareInfo);
 				if($source){$keyListNew[] = $source;}
 			};
@@ -123,10 +127,14 @@ public function listDataParseShareItem($listData,$parseSearch){
 	// 外链分享搜索
 	public function listDataParseShareLink($listData,$parseSearch){
 		if($parseSearch['type'] != KodIO::KOD_SHARE_LINK) return $listData;
+		$pathPre = '{shareItemLink:';
 		foreach ($listData as $key => $keyList) {
 			if($key != 'folderList' && $key != 'fileList' ) continue;
 			$keyListNew = array();
 			foreach ($keyList as $source){
+				$pathStart = substr($source['path'],0,strlen($pathPre));// 已经处理过
+				if($pathStart == $pathPre){$keyListNew[] = $source;continue;}
+
 				$source = Action('explorer.share')->shareItemInfo($source);
 				if($source){$keyListNew[] = $source;}
 			};
@@ -279,6 +287,7 @@ public function searchIO($path,$param){
 
 			if(kodIO::pathDriverLocal($info['path'])){
 				$infoFile = IO::info($item['path']); // 物理路径获取权限等情况;
+				$infoFile = is_array($infoFile) ? $infoFile:array();
 				$info = array_merge($infoFile,$info);
 			}
 			$typeKey = $isFolder ? 'folderList':'fileList';

app/controller/explorer/seo.class.php

@@ -274,7 +274,7 @@ private function shareMakeItem($item){
 		}
 		if(!$pathInfo) return '';
 		$link = $this->shareLink($item);
-		$user = _get($item['userInfo'],'nickName',_get($item['userInfo'],'name'));
+		$user = $item['nickName'] ? $item['nickName']:$item['name'];
 
 		$time = date('Y-m-d H:i',$item['createTime']);	
 		$size = size_format($pathInfo['size']);

app/controller/explorer/userShareGroup.class.php

@@ -191,7 +191,7 @@ private function makeItemUser($userInfo,$parentGroup=false){
 		$parentGroup  = $parentGroup ? $parentGroup:array('groupID'=>'0','parentLevel'=>'');
 		$result = array(
 			"userID"		=> $userInfo['userID'],
-			"name" 			=> _get($userInfo,"nickName",$userInfo["name"]),
+			"name" 			=> $userInfo['nickName'] ? $userInfo['nickName']:$userInfo['name'],
 			"type" 			=> "folder",
 			"path" 			=> "{shareToMe:group-u".$userInfo['userID']."-".$parentGroup['groupID']."}/",
 			"icon"			=> $userInfo["avatar"] ? $userInfo["avatar"]:$defaultThumb,//fileThumb,icon

app/controller/explorer/userShareUser.class.php

@@ -45,7 +45,7 @@ private function makeItemUser($userInfo){
 		$defaultThumb = STATIC_PATH.'images/common/default-avata.png';
 		$defaultThumb = 'root-user-avatar';// $userInfo["avatar"] = false;
 		$result = array(
-			"name" 			=> _get($userInfo,"nickName",$userInfo["name"]),
+			"name" 			=> $userInfo['nickName'] ? $userInfo['nickName']:$userInfo['name'],
 			"type" 			=> "folder",
 			"path" 			=> "{shareToMe:user-".$userInfo['userID']."}/",
 			"icon"			=> $userInfo["avatar"] ? $userInfo["avatar"]:$defaultThumb,//fileThumb,icon

app/controller/user/bind.class.php

@@ -67,6 +67,7 @@ public function sendEmail($input, $action,$title = '',$code = false) {
 		$name = _get($user,'nickName',_get($user,'name',''));
 		$desc = Model('SystemOption')->get('systemDesc');
 		$code = $code ? $code : rand_string(6,1);
+		if(!$name && isset($user['name'])){$name = $user['name'];}
 		$data = array(
 			'type'		=> 'email',
 			'input'		=> $input,

app/function/think.function.php

@@ -54,8 +54,9 @@ function think_exception($msg) {
 	$desc  = is_array($trace) ? implode("\n",array_slice($trace,-2)) : '';
 	$desc  = preg_replace("/{\w+}#/",'',$desc);
 	think_error_parse($error);
-	$error = "<div class='desc'>".$error."</div>";
-	$error = $error.'<div style="border-top:1px dotted #eee;"><code>'.$desc.'</code></div>';
+	$action = defined('ACTION') ? ' <span style="color:#888;font-size:12px;font-weight:200;">('.ACTION.')</span>' : '';
+	$error = "<div class='desc'>".$error.$action."</div>";
+	$error = $error.'<div style="border-top:1px dotted #eee;padding-top:10px;"><code>'.$desc.'</code></div>';
 	$error = $error.'<div style="color:#ccc;font-size:12px;"><code>['.think_system_info().']</code></div>';
 	show_tips($error,'',0,'',false);
 }

app/sdks/archiveLib/bin/data.bin

@@ -1,3 +1,3 @@
 <?php
 define('KOD_VERSION','1.46');
-define('KOD_VERSION_BUILD','02');
+define('KOD_VERSION_BUILD','03');

config/version.php

@@ -2,7 +2,7 @@
 	"id":"fileThumb",
 	"name":"{{LNG['fileThumb.meta.name']}}",
 	"title":"{{LNG['fileThumb.meta.title']}}",
-	"version":"1.92",// 2023.6.02
+	"version":"1.93",// 2023.11.07
 	"category":"file,media",
 	"source":{
 		"icon":"{{pluginHost}}static/icon.png"

plugins/fileThumb/package.json

@@ -146,7 +146,7 @@ public function parseItemXml($itemFile,$isInfo){
 		$picker = array(
 			'hasFile','hasFolder','fileInfo','fileInfoMore','oexeContent','parentID','isTruePath',
 			'isReadable','isWriteable','sourceRoot','icon','iconClassName','children',
-			'listAllChildren','fileThumb','fileShowView',
+			'listAllChildren','fileThumb','fileThumbCover','fileShowView',
 		);
 		foreach ($picker as $key){
 			if(array_key_exists($key,$itemFile)){$infoMore[$key] = $itemFile[$key];}