fix jquery bugs

icret · Feb 6, 2022 · 07d8763 · 07d8763
1 parent f352336
commit 07d8763
Show file tree

Hide file tree

Showing 22 changed files with 99 additions and 117 deletions.
diff --git a/README.md b/README.md
@@ -21,9 +21,9 @@
 >本人善写bug 发现bug可提交 [issues](https://github.com/icret/EasyImages2.0/issues) 追求稳定请下载 [稳定版](https://github.com/icret/EasyImages2.0/releases)
 
 ## 目录
-[特性](#特性) &nbsp;[使用注意](#使用注意) &nbsp;[安装](#安装) &nbsp;[程序升级](#程序升级) &nbsp;[安全配置](#安全配置) &nbsp;[更新日志](#更新日志) &nbsp;[支持开发者](#支持开发者) &nbsp;[界面演示](#界面演示) &nbsp;[兼容](#兼容) &nbsp;[鸣谢](#鸣谢) &nbsp;[开源许可](#开源许可) &nbsp;
+[特点](#特点) &nbsp;[使用注意](#使用注意) &nbsp;[安装](#安装) &nbsp;[程序升级](#程序升级) &nbsp;[安全配置](#安全配置) &nbsp;[更新日志](#更新日志) &nbsp;[支持开发者](#支持开发者) &nbsp;[界面演示](#界面演示) &nbsp;[兼容](#兼容) &nbsp;[鸣谢](#鸣谢) &nbsp;[开源许可](#开源许可) &nbsp;
 
-## 特性
+## 特点
 
 - [x] 支持仅登录后上传
 - [x] 支持设置图片质量
@@ -103,6 +103,12 @@ $HTTP["url"] =~ "^/(i|public)/" {
 
 <details><summary><mark>点击查看2.0版更新日志</mark></summary>
 
+* 2022-2-6 v2.4.9
+- 修复flash和silverlight路径引用(>IE9不影响)
+- markdown html alt值改为源文件名
+- 升级jquery-3.4.1至3.6.0
+- 调整了静态文件位置
+
 * 2022-2-5 v2.4.8
 - 调整缩略图内存至128M
 - 修复无可疑图片时显示错误

diff --git a/admin/admin.inc.php b/admin/admin.inc.php
diff --git a/application/footer.php b/application/footer.php
@@ -42,6 +42,13 @@
 <?php /** 环境检测 */ if ($config['checkEnv']) require_once APP_ROOT . '/application/check.php'; ?>
 
 <script>
+  // 导航状态
+  $('.nav-pills').find('a').each(function() {
+    if (this.href == document.location.href) {
+      $(this).parent().addClass('active'); // this.className = 'active';
+    }
+  });
+
   // js 获取当前网址二维码
   var qrcode = new QRCode(document.getElementById("qrcode"), {
     text: window.location.href,

diff --git a/application/function.php b/application/function.php
@@ -354,7 +354,7 @@ function getActive($url)
 {
     $arr = $_SERVER['SCRIPT_NAME'];
     if (strpos($arr, $url)) {
-        return 'class="active"';
+        return ' class="active"';
     }
 }
 

diff --git a/application/header.php b/application/header.php
@@ -10,6 +10,7 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="renderer" content="webkit" />
 	<meta name="force-rendering" content="webkit" />
+	<meta name="author" content="Icret EasyImage2.0">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title><?php echo  $config['title']; ?></title>
 	<meta name="keywords" content="<?php echo  $config['keywords']; ?>" />
@@ -20,57 +21,47 @@
 	<link href="<?php static_cdn(); ?>/public/static/zui/css/zui.min.css" rel="stylesheet">
 	<link href="<?php static_cdn(); ?>/public/static/zui/theme/zui-theme-<?php echo $config['theme']; ?>.css" rel="stylesheet">
 	<link href="<?php static_cdn(); ?>/public/static/zui/lib/uploader/zui.uploader.min.css" rel="stylesheet">
-	<link href="<?php static_cdn(); ?>/public/static/nprogress.min.css" rel="stylesheet">
-	<script src="<?php static_cdn(); ?>/public/static/zui/lib/jquery/jquery-3.4.1.min.js"></script>
+	<link href="<?php static_cdn(); ?>/public/static/nprogress/nprogress.min.css" rel="stylesheet">
+	<script src="<?php static_cdn(); ?>/public/static/zui/lib/jquery/jquery-3.6.0.min.js"></script>
 	<script src="<?php static_cdn(); ?>/public/static/zui/js/zui.min.js"></script>
-	<script src="<?php static_cdn(); ?>/public/static/qrcode.min.js"></script>
+	<script src="<?php static_cdn(); ?>/public/static/qrcode/qrcode.min.js"></script>
 	<script src="<?php static_cdn(); ?>/public/static/zui/lib/clipboard/clipboard.min.js"></script>
-	<script src="<?php static_cdn(); ?>/public/static/nprogress.min.js"></script>
+	<script src="<?php static_cdn(); ?>/public/static/nprogress/nprogress.min.js"></script>
 	<!--[if lt IE 9]>
     <script src="<?php static_cdn(); ?>/public/static/zui/lib/ieonly/html5shiv.js"></script>
     <script src="<?php static_cdn(); ?>/public/static/zui/lib/ieonly/respond.js"></script>
     <script src="<?php static_cdn(); ?>/public/static/zui/lib/ieonly/excanvas.js"></script>
   <![endif]-->
-	<?php /** 自定义代码 */ if (!empty($config['customize'])) echo $config['customize']; ?>
+	<?php /** 自定义代码 */ if ($config['customize']) echo $config['customize']; ?>
 
 </head>
 
 <body class="container">
-	<?php
-	if ($config['ad_top']) echo $config['ad_top_info']; ?>
+	<?php if ($config['ad_top']) echo $config['ad_top_info']; ?>
 	<div class="page-header">
 		<ul class="nav nav-pills">
-			<li <?php echo getActive('index'); ?>>
-				<a href="<?php echo $config['domain']; ?>">
-					<i class="icon icon-home"></i> 首页
-				</a>
+			<li>
+				<a href="<?php echo $config['domain']; ?>"><i class="icon icon-home"></i> 首页</a>
 			</li>
 			<?php
 			// 关闭广场非登录状态不显示广场导航
-			if ($config['showSwitch'] || is_who_login('admin'))
-				echo '
-			<li ' . getActive('list') . '>
-				<a href="' . $config['domain'] . '/application/list.php">
-					<i class="icon icon-th"></i> 广场 <span class="label label-badge label-success">' . get_file_by_glob(APP_ROOT . config_path(), 'number') . '</span>
-				</a>
-			</li>
-			';
+			if ($config['showSwitch'] || is_who_login('admin')) echo '
+			<li>
+				<a href="' . $config['domain'] . '/application/list.php"><i class="icon icon-th"></i> 广场<span class="label label-badge label-success">' . get_file_by_glob(APP_ROOT . config_path(), 'number') . '</span></a>
+			</li>';
 			// 登陆状态显示设置页面
 			if (is_who_login('admin')) {
-				echo '
-			<li ' . getActive('admin.inc') . ';><a href="' . $config['domain'] . '/admin/admin.inc.php' . '">
-				<i class="icon icon-cogs"></i> 设置</a>
-			</li>
-			';
+				echo '				
+			<li>
+				<a href="' . $config['domain'] . '/admin/admin.inc.php' . '"><i class="icon icon-cogs"></i> 设置</a>
+			</li>';
 				// 登陆状态下开启统计页面与导航
-				if ($config['chart_on'])
-					echo '
-			<li ' . getActive('chart') . '><a href="' . $config['domain'] . '/admin/chart.php' . '">
-				<i class="icon icon-pie-chart"></i> 统计</a>
-			</li>
-			';
-			}
-			?>
+				if ($config['chart_on']) echo '
+			<li>
+				<a href="' . $config['domain'] . '/admin/chart.php' . '"><i class="icon icon-pie-chart"></i> 统计</a>
+			</li>';
+			} ?>
+
 		</ul>
 	</div>
 	<!-- 顶部导航栏END -->
diff --git a/application/info.php b/application/info.php
@@ -87,7 +87,7 @@
         </div>
     </div>
 </div>
-<script src="<?php static_cdn(); ?>/public/static/exif.js"></script>
+<script src="<?php static_cdn(); ?>/public/static/exif/exif.js"></script>
 <script src="<?php static_cdn(); ?>/public/static/EasyImage.js"></script>
 <script>
     // 获取图片长宽
@@ -143,7 +143,7 @@ function getExif() {
         });
     }
     // 更改网页标题
-    document.title = "图片<?php echo basename($img); ?>的Exif信息 - <?php echo $config['title']; ?>"
+    document.title = "图片<?php echo basename($img); ?>的详细信息 - <?php echo $config['title']; ?>"
 </script>
 <?php
 include_once __DIR__ . "/footer.php";
diff --git a/application/list.php b/application/list.php
@@ -26,7 +26,7 @@
             <div class="bottom">
               <a href="' . $imgUrl . '" target="_blank"><i class="icon icon-picture" data-toggle="tooltip" title="原图" style="margin-left:10px;"></i></a>
               <a href="#" class="copy" data-clipboard-text="' . $imgUrl . '" data-toggle="tooltip" title="复制" style="margin-left:10px;"><i class="icon icon-copy"></i></a>
-              <a href="/application/info.php?img=' . $imgUrl . '" data-toggle="tooltip" title="Exif" target="_blank" style="margin-left:10px;"><i class="icon icon-info-sign"></i></a>
+              <a href="/application/info.php?img=' . $imgUrl . '" data-toggle="tooltip" title="详细信息" target="_blank" style="margin-left:10px;"><i class="icon icon-info-sign"></i></a>
               <a href="' . $config['domain'] . '/application/del.php?url=' . $imgUrl . '" target="_blank" data-toggle="tooltip" title="删除" style="margin-left:10px;"><i class="icon icon-trash"></i></a>              
               <label style="margin-left:10px;" class="text-primary"><input type="checkbox" style="margin: left 200px;" id="url" name="checkbox" value="' . $imgUrl . '"> 选择</label>
             </div> 
@@ -48,7 +48,7 @@
 @$httpUrl = array('date' => $path, 'num' => getFileNumber(APP_ROOT . config_path($path)));
 ?>
 </div>
-<script src="<?php static_cdn(); ?>/public/static/lazyload.js"></script>
+<script src="<?php static_cdn(); ?>/public/static/lazyload/lazyload.js"></script>
 <link rel="stylesheet" href="<?php static_cdn(); ?>/public/static/viewjs/viewer.min.css">
 <script src="<?php static_cdn(); ?>/public/static/viewjs/viewer.min.js"></script>
 <link href="<?php static_cdn(); ?>/public/static/zui/lib/datetimepicker/datetimepicker.min.css" rel="stylesheet">

diff --git a/config/config.php b/config/config.php
@@ -1,11 +1,11 @@
-<?php
+<?php
 $config=Array
 	(
 	'title'=>'简单图床 - EasyImage',
 	'keywords'=>'简单图床,easyimage,无数据库图床,PHP多图长传程序,自适应页面,HTML5,markdown,bbscode,一键复制',
 	'description'=>'简单图床EasyImage是一款支持多文件上传的无数据库图床,可以完美替代PHP多图上传程序，最新html5自适应页面兼容手机电脑，上传后返回图片直链，markdown图片，论坛贴图bbscode链接，简单方便支持一键复制，支持多域名，api上传。',
-	'tips'=>'<a><li class="icon icon-bullhorn text-muted"> 单文件≤10M，单次上传≤30张</li></a>
-<a href="https://github.com/icret/EasyImages2.0" target="_black"><i class="icon icon-heart"> 简单图床是一款开源图床, 支持多文件上传无数据库</i></a>
+	'tips'=>'<a><li class="icon icon-bullhorn text-muted"> 单文件≤10M，单次上传≤30张</li></a>
+<a href="https://github.com/icret/EasyImages2.0" target="_black"><i class="icon icon-heart"> 简单图床是一款开源图床, 支持多文件上传无数据库</i></a>
 <a href="https://github.com/icret/EasyImages2.0" target="_black"><i class="icon icon-github"> 如果你喜欢这种图床风格就下载喔 (๑•̀ㅂ•́)و✧</i></a>',
 	'domain'=>'http://127.0.0.1',
 	'imgurl'=>'http://127.0.0.1',
@@ -47,15 +47,15 @@
 	'checkImg_value'=>50,
 	'moderatecontent_key'=>'',
 	'nsfwjs_url'=>'',
-	'footer'=>'<a href="/admin/terms.php" target="_blank">请勿上传违反中国政策的图片</a>
-<script>
-var _hmt = _hmt || [];
-(function() {
-  var hm = document.createElement("script");
-  hm.src = "https://hm.baidu.com/hm.js?c790ac2bdc2f385757ecd0183206108d";
-  var s = document.getElementsByTagName("script")[0]; 
-  s.parentNode.insertBefore(hm, s);
-})();
+	'footer'=>'<a href="/admin/terms.php" target="_blank">请勿上传违反中国政策的图片</a>
+<script>
+var _hmt = _hmt || [];
+(function() {
+  var hm = document.createElement("script");
+  hm.src = "https://hm.baidu.com/hm.js?c790ac2bdc2f385757ecd0183206108d";
+  var s = document.getElementsByTagName("script")[0]; 
+  s.parentNode.insertBefore(hm, s);
+})();
 </script>',
 	'ad_top'=>0,
 	'ad_top_info'=>' <!--广告 按照这个范例替换相应链接，如果想多几个广告，就多复制几个-->
@@ -80,6 +80,6 @@
 	'check_ip'=>0,
 	'check_ip_model'=>0,
 	'check_ip_list'=>'',
-	'version'=>'2.4.8',
-	'form'=>'2022-02-04 20:31:03'
+	'version'=>'2.4.9',
+	'form'=>'2022-02-06 15:27:17'
 	);
diff --git a/index.php b/index.php
@@ -95,9 +95,9 @@
     // 点击文件列表上传文件
     browseByClickList: true,
     // flash 上传组件地址
-    flash_swf_url: 'public/static/zui/lib/uploader/Moxie.swf',
+    flash_swf_url: '<?php static_cdn(); ?>/public/static/zui/lib/uploader/Moxie.swf',
     // silverlight 上传组件地址
-    flash_swf_url: 'public/static/zui/lib/uploader/Moxie.xap',
+    flash_swf_url: '<?php static_cdn(); ?>/public/static/zui/lib/uploader/Moxie.xap',
     // 预览图尺寸
     previewImageSize: {
       'width': 80,
@@ -122,26 +122,17 @@
     autoResetFails: true,
     <?php echo imgRatio(); ?>,
     responseHandler: function(responseObject, file) {
-
       var obj = JSON.parse(responseObject.response); //由JSON字符串转换为JSON对象
       console.log(obj); // 输出log
+      console.log(file); // 输出log
       if (obj.result === 'success') {
-        var links = document.getElementById("links");
-        links.innerHTML += obj.url + "\r\n";
-
-        var bbscode = document.getElementById("bbscode");
-        bbscode.innerHTML += "[img]" + obj.url + "[/img]\r\n";
-
-        var markdown = document.getElementById("markdown");
-        markdown.innerHTML += "![" + obj.srcName + "](" + obj.url + ")\r\n";
-
-        var html = document.getElementById("html");
-        html.innerHTML += '<img src="' + obj.url + '" alt="' + obj.srcName + '" />\r\n';
-
-        var del = document.getElementById("del");
-        del.innerHTML += obj.del + "\r\n";
+        document.getElementById("links").innerHTML += obj.url + "\r\n";
+        document.getElementById("bbscode").innerHTML += "[img]" + obj.url + "[/img]\r\n";
+        document.getElementById("markdown").innerHTML += "![" + obj.srcName + "](" + obj.url + ")\r\n";
+        document.getElementById("html").innerHTML += '<img src="' + obj.url + '" alt="' + obj.srcName + '" />\r\n';
+        document.getElementById("del").innerHTML += obj.del + "\r\n";
       } else {
-        return '上传失败,服务器返回错误:' + obj.message;
+        return '上传失败,错误信息:' + obj.message;
       }
     }
   });

diff --git a/install/index.php b/install/index.php
@@ -52,11 +52,11 @@ function checkPASS($name)
     <meta name="description" content="EasyIamge 2.0 安装环境检测" />
     <link rel="shortcut icon" href="./../favicon.ico" type="image/x-icon" />
     <link href="./../public/static/zui/css/zui.min.css?v1.10.0" rel="stylesheet">
-    <link href="./../public/static/nprogress.min.css?v1.10.0" rel="stylesheet">
-    <script src="./../public/static/zui/lib/jquery/jquery-3.4.1.min.js?v3.4.1"></script>
+    <link href="./../public/static/nprogress/nprogress.min.css?v1.10.0" rel="stylesheet">
+    <script src="./../public/static/zui/lib/jquery/jquery-3.6.0.min.js?v3.4.1"></script>
     <script src="./../public/static/zui/js/zui.min.js?v1.10.0"></script>
-    <script src="./../public/static/qrcode.min.js?v2.0"></script>
-    <script src="./../public/static/nprogress.min.js"></script>
+    <script src="./../public/static/qrcode/qrcode.min.js?v2.0"></script>
+    <script src="./../public/static/nprogress/nprogress.min.js"></script>
 </head>
 
 <body class="container">

diff --git a/install/install.php b/install/install.php
@@ -24,11 +24,11 @@
     <meta name="description" content="EasyIamge 2.0 即将完成安装!" />
     <link rel="shortcut icon" href="./../favicon.ico" type="image/x-icon" />
     <link href="./../public/static/zui/css/zui.min.css?v1.10.0" rel="stylesheet">
-    <link href="./../public/static/nprogress.min.css?v1.10.0" rel="stylesheet">
-    <script src="./../public/static/zui/lib/jquery/jquery-3.4.1.min.js?v3.4.1"></script>
+    <link href="./../public/static/nprogress/nprogress.min.css?v1.10.0" rel="stylesheet">
+    <script src="./../public/static/zui/lib/jquery/jquery-3.6.0.min.js?v3.4.1"></script>
     <script src="./../public/static/zui/js/zui.min.js?v1.10.0"></script>
-    <script src="./../public/static/qrcode.min.js?v2.0"></script>
-    <script src="./../public/static/nprogress.min.js"></script>
+    <script src="./../public/static/qrcode/qrcode.min.js?v2.0"></script>
+    <script src="./../public/static/nprogress/nprogress.min.js"></script>
     <style>
         .message {
             font-size: 12px;

diff --git a/public/static/exif.js → public/static/exif/exif.js b/public/static/exif.js → public/static/exif/exif.js