diff --git a/README.md b/README.md old mode 100755 new mode 100644 index ac7a8ca..b93fe26 --- a/README.md +++ b/README.md @@ -180,11 +180,14 @@ $HTTP["url"] =~ "^/(i|public)/" {
点击查看2.0版更新日志 -* 2022-05-05 v2.6.3 deving +* 2022-05-18 v2.6.3 Deving 此版本正在开发中, 尚未发布 +- 增加读取上传日志 - 增加广场浏览往日限制 - 有助于防爬虫抓取 -- 修复广场->信息中无法显示Exif +- 文件管理中图片使用缩略图显示 - 更改广场->信息中图片长宽获取方式 +- 删除图片详情页Exif信息 +- 优化图片详情页 - 优化广场UI * 2022-05-04 v2.6.2 diff --git a/admin/admin.inc.php b/admin/admin.inc.php old mode 100755 new mode 100644 index 740bde3..4264ae0 --- a/admin/admin.inc.php +++ b/admin/admin.inc.php @@ -51,7 +51,7 @@ if (isset($_POST['add_token_id'])) { cache_write($config_file, $new_config, 'tokenList'); echo ' - '; - } - } - - if ($config['checkImg'] == 2) { - - $ip = parse_url($config['nsfwjs_url'])['host']; - $port = parse_url($config['nsfwjs_url'])['port']; - - if (filter_var($ip, FILTER_VALIDATE_IP)) { - if (!@IP_URL_Ping($ip, $port, 1)) { - echo ' - - '; - } - } else { - if (!@IP_URL_Ping($ip, 80, 1)) { - echo ' - - '; - } - } - } -} - // 检测是否存在.user.ini if (file_exists(APP_ROOT . '/.user.ini')) { echo ' @@ -108,7 +63,7 @@ if (file_exists(APP_ROOT . '/.user.ini')) { } // 检查当前版本与GitHub版本 -if (@getVersion() !== $config['version']) { +if (getVersion() !== $config['version']) { echo ' '; } + +// 检测监黄接口是否可以访问 +if ($config['checkImg'] !== 0) { + + if ($config['checkImg'] == 1) { + + if (!@IP_URL_Ping('api.moderatecontent.com', 80, 1)) { + echo ' + + '; + } + } + + if ($config['checkImg'] == 2) { + + $ip = parse_url($config['nsfwjs_url'])['host']; + $port = parse_url($config['nsfwjs_url'])['port']; + + if (filter_var($ip, FILTER_VALIDATE_IP)) { + if (!@IP_URL_Ping($ip, $port, 1)) { + echo ' + + '; + } + } else { + if (!@IP_URL_Ping($ip, 80, 1)) { + echo ' + + '; + } + } + } +} diff --git a/application/class.thumb.php b/application/class.thumb.php old mode 100755 new mode 100644 diff --git a/application/class.upload.php b/application/class.upload.php old mode 100755 new mode 100644 diff --git a/application/class.version.php b/application/class.version.php old mode 100755 new mode 100644 diff --git a/application/compress/Imagick/class.Imgcompress.php b/application/compress/Imagick/class.Imgcompress.php old mode 100755 new mode 100644 diff --git a/application/compress/TinyImg/TinyImg.php b/application/compress/TinyImg/TinyImg.php old mode 100755 new mode 100644 diff --git a/application/compress/TinyImg/cacert.pem b/application/compress/TinyImg/cacert.pem old mode 100755 new mode 100644 diff --git a/application/compress/function.compress.php b/application/compress/function.compress.php old mode 100755 new mode 100644 diff --git a/application/compressing.php b/application/compressing.php old mode 100755 new mode 100644 diff --git a/application/del.php b/application/del.php old mode 100755 new mode 100644 diff --git a/application/footer.php b/application/footer.php old mode 100755 new mode 100644 index 1ce9585..264eabd --- a/application/footer.php +++ b/application/footer.php @@ -48,19 +48,22 @@ if ($config['notice_status'] == 1 && !empty($config['notice'])) : ?> '; - } else { - echo ''; - } - ?> + // 登录与退出 + if (is_who_login('admin') || is_who_login('guest')) : ?> + + + +

diff --git a/application/function.php b/application/function.php old mode 100755 new mode 100644 index 0e6fd27..2b36ec9 --- a/application/function.php +++ b/application/function.php @@ -1346,3 +1346,31 @@ function isAnimatedGifWebp($src) fclose($fp); return strpos($filecontent, chr(0x21) . chr(0xff) . chr(0x0b) . 'NETSCAPE2.0') === FALSE ? false : true; } + +/** + * 读取日志 + * @param filepath 文件路径 + */ +function read_upload_logs($logs = null) +{ + global $config; + + $logs = isset($logs) ? $logs : APP_ROOT . '/admin/logs/upload/' . date('Y-m') . '.php'; + + if ($config['upload_logs'] == 0) { + $logs = '已经关闭了上传日志!'; + } else { + if (file_exists($logs)) { + $logs = file_get_contents($logs, false, null, 274, 1000000); + $logs = str_replace( + array('{', '}}', '"', '\\', 'source:', 'date:', 'ip:', 'port:', 'user_agent:', 'path:', 'size:', 'checkImg:', 'from:'), + array('', '', '', '', '源名:', '日期:', 'IP:', '端口:', '信息:', '路径:', '大小:', '鉴黄状态:', '来源:'), + $logs + ); + } else { + $logs = "日志文件不存在,可能是当前月份没有新上传日志,请尝试上传一张!"; + } + } + + return $logs; +} diff --git a/application/header.php b/application/header.php old mode 100755 new mode 100644 diff --git a/application/hide.php b/application/hide.php old mode 100755 new mode 100644 diff --git a/application/info.php b/application/info.php old mode 100755 new mode 100644 index f48dd04..87d7b9a --- a/application/info.php +++ b/application/info.php @@ -7,12 +7,11 @@ if (!$config['show_exif_info']) exit(header('Location: ' . $config['domain'] . ' if (isset($_GET['img'])) { // 过滤特殊符号 $getIMG = strip_tags($_GET['img']); - $exif_url = $config['domain'] . $getIMG; + $del_url = $config['domain'] . $getIMG; } else { // 未获取到图片地址 - $getIMG = rand_imgurl() . "/public/images/404.png"; - - $exif_url = $config['domain'] . "/public/images/404.png"; + $getIMG = "/public/images/404.png"; + $del_url = "#"; } // 开启隐藏上传目录 @@ -29,7 +28,7 @@ $imgABPath = APP_ROOT . $getIMG; // 图片是否存在 if (!file_exists($imgABPath)) { $imgABPath = APP_ROOT . "/public/images/404.png"; - $getIMG = rand_imgurl() . "/public/images/404.png"; + $img_url = rand_imgurl() . "/public/images/404.png"; } // 图片尺寸 @@ -41,36 +40,44 @@ if ($config['ad_top']) echo $config['ad_top_info']; ?>
- <?php echo basename($getIMG); ?> - - + <?php echo $img_url; ?>

图片名称:

-

图片类型:

-

图片宽高: px

图片大小:

+

图片类型: image/

+

图片宽高: px

上传时间:

+

文件操作： + 查看 + + 回收 + 删除 + +

+

此图片来自网友上传, 不代表本站立场, 若有侵权, 请联系管理员删除!

+ -
+ 

             

         
+        -->
     
 
 

     

         

             

-                 直 连         
+                 直 链         
                 
                 
             

@@ -101,7 +108,7 @@ if ($config['ad_top']) echo $config['ad_top_info'];
     

 

 
-
+
 
 
 
diff --git a/application/lang/class.upload.xx_XX.php b/application/lang/class.upload.xx_XX.php
old mode 100755
new mode 100644
diff --git a/application/lang/class.upload.zh_CN.php b/application/lang/class.upload.zh_CN.php
old mode 100755
new mode 100644
diff --git a/application/lang/class.upload.zh_TW.php b/application/lang/class.upload.zh_TW.php
old mode 100755
new mode 100644
diff --git a/application/list.php b/application/list.php
old mode 100755
new mode 100644
index dffaf67..4cd0fd5
--- a/application/list.php
+++ b/application/list.php
@@ -131,10 +131,10 @@ if ($config['ad_top']) echo $config['ad_top_info'];
       
 -->
     

       

-        JPG
-        PNG
-        GIF
-        Webp
+        JPG
+        PNG
+        GIF
+        Webp
       

     

     
@@ -150,7 +150,7 @@ if ($config['ad_top']) echo $config['ad_top_info'];
       
     
     
-    

+    

   
 
 
@@ -372,6 +372,7 @@ if ($config['ad_top']) echo $config['ad_top_info'];
     format: "yyyy/mm/dd/",
     endDate: new Date() // 只能选当前日期之前
   });
+
   // 更改网页标题
   document.title = "图床广场 - 今日上传张 昨日张 - "
 
diff --git a/application/md5.php b/application/md5.php
old mode 100755
new mode 100644
diff --git a/application/post_del.php b/application/post_del.php
old mode 100755
new mode 100644
diff --git a/application/process.php b/application/process.php
old mode 100755
new mode 100644
index b391751..b96fb88
--- a/application/process.php
+++ b/application/process.php
@@ -103,7 +103,7 @@ function write_log($filePath, $sourceName, $absolutePath, $fileSize, $from = "we
 {
     global $config;
 
-    $checkImg = $config['checkImg'] == true ? "Passed" : "Closed";
+    $checkImg = $config['checkImg'] == true ? "Enabled" : "Disabled";
 
     // $name = trim(basename($filePath), " \t\n\r\0\x0B"); // 当前图片名称
     $log = array(basename($filePath) => array(             // 以上传图片名称为Array
diff --git a/application/read_upload_logs.php b/application/read_upload_logs.php
new file mode 100644
index 0000000..39c40d4
--- /dev/null
+++ b/application/read_upload_logs.php
@@ -0,0 +1,16 @@
+
+';
+echo read_upload_logs();
+echo '';
diff --git a/application/thumb.php b/application/thumb.php
old mode 100755
new mode 100644
diff --git a/application/total_files.php b/application/total_files.php
old mode 100755
new mode 100644
diff --git a/application/upload.php b/application/upload.php
old mode 100755
new mode 100644
diff --git a/config/api_key.php b/config/api_key.php
old mode 100755
new mode 100644
index c067e40..6f9f951
--- a/config/api_key.php
+++ b/config/api_key.php
@@ -1,4 +1,4 @@
-Array
@@ -13,10 +13,10 @@ $tokenList=Array
 		'expired'=>2509722743,
 		'add_time'=>1645722743
 		),
-	'9ffe2475f65412c76c88d09824c34a4f'=>Array
+	'71bedf5695ec492ad4a7f8f907d4219c'=>Array
 		(
-		'id'=>2,
-		'expired'=>1649393743,
-		'add_time'=>1649480143
+		'id'=>0,
+		'expired'=>1652080021,
+		'add_time'=>1652080015
 		)
 	);
\ No newline at end of file
diff --git a/config/config.guest.php b/config/config.guest.php
old mode 100755
new mode 100644
diff --git a/config/config.manager.php b/config/config.manager.php
old mode 100755
new mode 100644
diff --git a/config/config.php b/config/config.php
old mode 100755
new mode 100644
index 3b272d6..904d395
--- a/config/config.php
+++ b/config/config.php
@@ -81,7 +81,7 @@ $config=Array
 		9=>'month'
 		),
 	'language'=>0,
-	'login_bg'=>'https://cdn.jsdelivr.net/gh/icret/EasyImages2.0@2.6.2/public/images/login_bg.jpg',
+	'login_bg'=>'https://tva3.sinaimg.cn/large/718153f4gy1gzpmuymj1rj20sg0nr76c.jpg',
 	'image_recycl'=>1,
 	'tinyfilemanager'=>1,
 	'delDir'=>'thumbnails/',
@@ -93,7 +93,7 @@ $config=Array
 	'token_path_status'=>0,
 	'admin_path'=>'u',
 	'version'=>'2.6.2',
-	'update'=>'2022-05-09 00:40:59',
+	'update'=>'2022-05-18 21:32:50',
 	'footer'=>'请勿上传违反中国政策的图片