4.45 release

kalcaddle · Apr 9, 2021 · 6d25211 · 6d25211
1 parent 70f8e19
commit 6d25211
Show file tree

Hide file tree

Showing 1,315 changed files with 669 additions and 46 deletions.
diff --git a/app/api/sso.class.php b/app/api/sso.class.php
diff --git a/app/controller/api.class.php b/app/controller/api.class.php
diff --git a/app/controller/app.class.php b/app/controller/app.class.php
diff --git a/app/controller/desktop.class.php b/app/controller/desktop.class.php
diff --git a/app/controller/editor.class.php b/app/controller/editor.class.php
diff --git a/app/controller/explorer.class.php b/app/controller/explorer.class.php
diff --git a/app/controller/fav.class.php b/app/controller/fav.class.php
diff --git a/app/controller/pluginApp.class.php b/app/controller/pluginApp.class.php
diff --git a/app/controller/setting.class.php b/app/controller/setting.class.php
diff --git a/app/controller/share.class.php b/app/controller/share.class.php
@@ -220,6 +220,7 @@ public function commonJs(){
 			'staticPath'    => STATIC_PATH,
 			'appIndex'  	=> $_SERVER['SCRIPT_NAME'],
 			'version'       => KOD_VERSION,
+			'versionBuild'  => KOD_VERSION_BUILD,
 			'versionDesc'   => $versionDesc,
 			'kodID'			=> md5(BASIC_PATH.$this->config['settingSystem']['systemPassword']),
 

diff --git a/app/controller/systemGroup.class.php b/app/controller/systemGroup.class.php
diff --git a/app/controller/systemMember.class.php b/app/controller/systemMember.class.php
diff --git a/app/controller/systemRole.class.php b/app/controller/systemRole.class.php
diff --git a/app/controller/user.class.php b/app/controller/user.class.php
@@ -28,7 +28,7 @@ function __construct(){
 		$this->notCheckST = array('share','debug');
 		$this->notCheckACT = array(
 			'loginFirst','login','logout','loginSubmit',
-			'checkCode','publicLink','qrcode','sso','appConfig');
+			'checkCode','publicLink','qrcode','sso');
 
 		$this->notCheckApp = array();//'pluginApp.to'
 		if(!$this->user){
@@ -168,7 +168,7 @@ private function _loginCheckPassword($user,$password){
 		show_tips("密码长度必须大于6,同时包含英文和数字;<br/>请联系管理员修改后再试!",false);
 	}
 	private function checkPassword($password){
-		if(INSTALL_CHANNEL =='hikvision.com'){
+		if(defined('INSTALL_CHANNEL') && INSTALL_CHANNEL =='hikvision.com'){
 			$this->config['settingSystemDefault']['passwordCheck'] = '1';
 		}
 		if($this->config['settingSystemDefault']['passwordCheck'] == '0') return true;
@@ -309,6 +309,7 @@ public function commonJs(){
 			),
 			'phpVersion'	=> PHP_VERSION,
 			'version'       => KOD_VERSION,
+			'versionBuild'  => KOD_VERSION_BUILD,
 			'kodID'			=> md5(BASIC_PATH.$this->config['settingSystem']['systemPassword']),
 			'jsonData'   	=> "",
 			'selfShare'		=> systemMember::userShareList($this->user['userID']),
@@ -361,6 +362,7 @@ public function appConfig(){
 				'uploadCheckChunk'	=> $this->config['settings']['uploadCheckChunk'],
 			),
 			'version'       => KOD_VERSION,
+			'versionBuild'  => KOD_VERSION_BUILD,
 			// 'userConfig' 	=> $this->config['user'],
 		);
 		show_json($theConfig);

diff --git a/app/controller/userShare.class.php b/app/controller/userShare.class.php
diff --git a/app/controller/utils.php b/app/controller/utils.php
diff --git a/app/core/Application.class.php b/app/core/Application.class.php
diff --git a/app/core/Controller.class.php b/app/core/Controller.class.php
diff --git a/app/core/Model.class.php b/app/core/Model.class.php
diff --git a/app/desktop_app.php b/app/desktop_app.php
@@ -0,0 +1,59 @@
+<?php 
+$desktopApps = array(
+	'my_computer' => array(
+		"type"		=> "app",
+		"content"	=> "core.explorer('','".LNG('my_computer')."');",
+		"icon"		=> STATIC_PATH."images/file_icon/icon_others/computer.png",
+		"name"		=> LNG('my_computer'),
+		"menuType"	=> "systemBox menu-default",
+		"ext"		=> 'oexe',
+		"path"		=> "",
+		"resize"	=> 1
+	),
+	'recycle' => array(
+		"type"		=> "app",
+		"content"	=> "core.explorer('".KOD_USER_RECYCLE."','".LNG('recycle')."');",
+		"icon"		=> STATIC_PATH."images/file_icon/icon_others/recycle.png",
+		"name"		=> LNG('recycle'),
+		"menuType"	=> "systemBox menu-recycle-button",
+		"ext"		=> 'oexe',
+		"path"		=> "",
+		"resize"	=> 1
+	),
+	'PluginCenter' => array(
+		"type"		=> "app",
+		"content"	=> "core.openWindowBig('./index.php?pluginApp/index','".LNG('PluginCenter')."');",
+		"icon"		=> STATIC_PATH."images/file_icon/icon_others/plugins.png",
+		"name"		=> LNG('PluginCenter'),
+		"menuType"	=> "systemBox menu-default",
+		"ext"		=> 'oexe',
+		"path"		=> "",
+		"resize"	=> 1
+	),
+	'setting' => array(
+		"type"		=> "app",
+		"content"	=> "core.setting();",
+		"icon"		=> STATIC_PATH."images/file_icon/icon_others/setting.png",
+		"name"		=> LNG('setting'),
+		"menuType"	=> "systemBox menu-default",
+		"ext"		=> 'oexe',
+		"path"		=> "/",
+		"resize"	=> 1
+	),
+	'appStore' => array(
+		"type"		=> "app",
+		"content"	=> "core.appStore();",
+		"icon"		=> STATIC_PATH."images/file_icon/icon_others/appStore.png",
+		"name"		=> LNG('app_store'),
+		"menuType"	=> "systemBox menu-default",
+		"ext"		=> 'oexe',
+		"path"		=> "",
+		"resize"	=> 1
+	)
+);
+
+//管理员插件中心
+if(!$GLOBALS['isRoot']){
+	unset($desktopApps['PluginCenter']);
+}
+return $desktopApps;
diff --git a/app/function/common.function.php b/app/function/common.function.php
diff --git a/app/function/file.function.php b/app/function/file.function.php
diff --git a/app/function/helper.function.php b/app/function/helper.function.php
diff --git a/app/function/others/JSON.php b/app/function/others/JSON.php
diff --git a/app/function/web.function.php b/app/function/web.function.php
diff --git a/app/kod/Downloader.class.php b/app/kod/Downloader.class.php
diff --git a/app/kod/FileCache.class.php b/app/kod/FileCache.class.php
diff --git a/app/kod/Hook.class.php b/app/kod/Hook.class.php
diff --git a/app/kod/I18n.class.php b/app/kod/I18n.class.php
diff --git a/app/kod/ImageThumb.class.php b/app/kod/ImageThumb.class.php
diff --git a/app/kod/KodArchive.class.php b/app/kod/KodArchive.class.php
diff --git a/app/kod/Mcrypt.class.php b/app/kod/Mcrypt.class.php
diff --git a/app/kod/PluginBase.class.php b/app/kod/PluginBase.class.php
@@ -257,10 +257,11 @@ final function initLang(){
 		$lang = I18n::getType();
 		$array = array();
 		if(file_exists($path.$lang.'.php')){
-			$array = include_once($path.$lang.'.php');
+			$array = include($path.$lang.'.php');
 		}else if(file_exists($path.$default.'.php')){
-			$array = include_once($path.$default.'.php');
+			$array = include($path.$default.'.php');
 		}
+		if(!is_array($array)) return array();
 		if(count($array) > 0){
 			I18n::set($array);
 		}

diff --git a/app/kod/archiveLib/bin/7z b/app/kod/archiveLib/bin/7z
diff --git a/app/kod/archiveLib/bin/7z.exe b/app/kod/archiveLib/bin/7z.exe
diff --git a/app/kod/archiveLib/bin/rar b/app/kod/archiveLib/bin/rar
diff --git a/app/kod/archiveLib/bin/rar.exe b/app/kod/archiveLib/bin/rar.exe
diff --git a/app/kod/archiveLib/kodRarArchive.class.php b/app/kod/archiveLib/kodRarArchive.class.php
diff --git a/app/kod/archiveLib/kodZipArchive.class.php b/app/kod/archiveLib/kodZipArchive.class.php
@@ -83,7 +83,7 @@ static function extract($file,$dest,$partName=false) {
 		$zip->close();
 
         //子目录解压移除多余层级目录
-		if( is_array(c) ){
+		if( is_array($partName) ){
 			$thePath = trim(str_replace("\\",'/',$partName[0]),'/');
 			$pathGroup = explode('/',$thePath);
 			//一级目录解压不用移动

diff --git a/app/kod/archiveLib/pclerror.lib.php b/app/kod/archiveLib/pclerror.lib.php
diff --git a/app/kod/archiveLib/pcltar.lib.php b/app/kod/archiveLib/pcltar.lib.php
diff --git a/app/kod/archiveLib/pcltrace.lib.php b/app/kod/archiveLib/pcltrace.lib.php
diff --git a/app/kod/archiveLib/pclzip.class.php b/app/kod/archiveLib/pclzip.class.php
diff --git a/app/kod/imageGdBMP.class.php b/app/kod/imageGdBMP.class.php
diff --git a/app/model/ConfigModel.class .php b/app/model/ConfigModel.class .php
diff --git a/app/model/PluginModel.class.php b/app/model/PluginModel.class.php
diff --git a/app/sdks/MyCaptcha.class.php b/app/sdks/MyCaptcha.class.php
diff --git a/app/sdks/MyCaptcha_fonts/font_1.png b/app/sdks/MyCaptcha_fonts/font_1.png
diff --git a/app/sdks/MyCaptcha_fonts/font_2.png b/app/sdks/MyCaptcha_fonts/font_2.png
diff --git a/app/sdks/MyCaptcha_fonts/font_3.png b/app/sdks/MyCaptcha_fonts/font_3.png
diff --git a/app/sdks/QRcode.class.php b/app/sdks/QRcode.class.php
diff --git a/app/sdks/lessc.class.php b/app/sdks/lessc.class.php
diff --git a/app/template/api/view.html b/app/template/api/view.html
diff --git a/app/template/app/index.html b/app/template/app/index.html
diff --git a/app/template/common/footer.html b/app/template/common/footer.html
diff --git a/app/template/common/footerCommon.html b/app/template/common/footerCommon.html
diff --git a/app/template/common/header.html b/app/template/common/header.html
diff --git a/app/template/common/navbar.html b/app/template/common/navbar.html
diff --git a/app/template/common/navbarShare.html b/app/template/common/navbarShare.html
diff --git a/app/template/common/showTips.html b/app/template/common/showTips.html
diff --git a/app/template/desktop/index.html b/app/template/desktop/index.html
diff --git a/app/template/editor/edit.html b/app/template/editor/edit.html
diff --git a/app/template/editor/editor.html b/app/template/editor/editor.html
diff --git a/app/template/explorer/content.html b/app/template/explorer/content.html
diff --git a/app/template/explorer/explorerWap.html b/app/template/explorer/explorerWap.html
diff --git a/app/template/explorer/index.html b/app/template/explorer/index.html
diff --git a/app/template/pluginApp/index.html b/app/template/pluginApp/index.html
diff --git a/app/template/setting/index.html b/app/template/setting/index.html
diff --git a/app/template/share/edit.html b/app/template/share/edit.html
diff --git a/app/template/share/editor.html b/app/template/share/editor.html
diff --git a/app/template/share/explorer.html b/app/template/share/explorer.html
diff --git a/app/template/share/explorerWap.html b/app/template/share/explorerWap.html
diff --git a/app/template/share/file.html b/app/template/share/file.html
diff --git a/app/template/share/tips.html b/app/template/share/tips.html
diff --git a/app/template/user/install.html b/app/template/user/install.html
diff --git a/app/template/user/license.html b/app/template/user/license.html
diff --git a/app/template/user/login.html b/app/template/user/login.html
diff --git a/app/template/user/loginWap.html b/app/template/user/loginWap.html