diff --git a/README.md b/README.md index 173709b..8a8d097 100755 --- a/README.md +++ b/README.md @@ -104,8 +104,10 @@ $HTTP["url"] =~ "^/(i|public)/" {
点击查看2.0版更新日志 * 2022-2-21 v2.5.3 Developing +- 增加图床数据开放 - 增加自定义服务条款 - 升级 Viewer.js 到 v1.10.4 +- 将页面选择记录从cookie改为本地存储 - 修复实时生成缩略图导致的页面布局异常 - 优化显示代码 diff --git a/admin/admin.inc.php b/admin/admin.inc.php index 8edfa1c..1d34ad8 100755 --- a/admin/admin.inc.php +++ b/admin/admin.inc.php @@ -527,16 +527,55 @@ if (isset($_GET['reimg'])) {
-
- - > - +
+ + > +
-
+ + + + + + + + + + +
+
+
+ + > + +
+
+
+
- title="日志每月保存一个文件;经过测试每月二十万条数据并不影响速度! "> + >
@@ -816,26 +855,23 @@ if (isset($_GET['reimg'])) { - - \ No newline at end of file diff --git a/config/config.php b/config/config.php index 7dbbb33..81a43d9 100755 --- a/config/config.php +++ b/config/config.php @@ -39,7 +39,7 @@ $config=Array 'imgRatio_quality'=>80, 'imgRatio_crop'=>0, 'imgRatio_preserve_headers'=>1, - 'static_cdn'=>0, + 'static_cdn'=>1, 'theme'=>'default', 'static_cdn_url'=>'https://cdn.jsdelivr.net/gh/icret/EasyImages2.0@2.5.2', 'TinyPng_key'=>'', @@ -58,14 +58,14 @@ var _hmt = _hmt || []; })(); ', 'ad_top'=>0, - 'ad_top_info'=>' -
- + 'ad_top_info'=>' +
+
', 'ad_bot'=>0, - 'ad_bot_info'=>'
- 打赏作者 - 打赏作者 + 'ad_bot_info'=>'
+ 打赏作者 + 打赏作者
', 'showSwitch'=>1, 'showSort'=>1, @@ -81,9 +81,23 @@ var _hmt = _hmt || []; 'check_ip'=>0, 'check_ip_model'=>0, 'check_ip_list'=>'', + 'public'=>0, + 'public_list'=>Array + ( + 0=>'time', + 1=>'today', + 2=>'yesterday', + 3=>'total_space', + 4=>'used_space', + 5=>'free_space', + 6=>'image_used', + 7=>'file', + 8=>'dir', + 9=>'month' + ), 'language'=>0, 'version'=>'2.5.3', - 'update'=>'2022-02-22 03:37:40', + 'update'=>'2022-02-22 18:47:40', 'terms'=>'
diff --git a/public/static/jquery/jquery.cookie.js b/public/static/jquery/jquery.cookie.js deleted file mode 100755 index c7f3a59..0000000 --- a/public/static/jquery/jquery.cookie.js +++ /dev/null @@ -1,117 +0,0 @@ -/*! - * jQuery Cookie Plugin v1.4.1 - * https://github.com/carhartl/jquery-cookie - * - * Copyright 2013 Klaus Hartl - * Released under the MIT license - */ -(function (factory) { - if (typeof define === 'function' && define.amd) { - // AMD - define(['jquery'], factory); - } else if (typeof exports === 'object') { - // CommonJS - factory(require('jquery')); - } else { - // Browser globals - factory(jQuery); - } -}(function ($) { - - var pluses = /\+/g; - - function encode(s) { - return config.raw ? s : encodeURIComponent(s); - } - - function decode(s) { - return config.raw ? s : decodeURIComponent(s); - } - - function stringifyCookieValue(value) { - return encode(config.json ? JSON.stringify(value) : String(value)); - } - - function parseCookieValue(s) { - if (s.indexOf('"') === 0) { - // This is a quoted cookie as according to RFC2068, unescape... - s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); - } - - try { - // Replace server-side written pluses with spaces. - // If we can't decode the cookie, ignore it, it's unusable. - // If we can't parse the cookie, ignore it, it's unusable. - s = decodeURIComponent(s.replace(pluses, ' ')); - return config.json ? JSON.parse(s) : s; - } catch(e) {} - } - - function read(s, converter) { - var value = config.raw ? s : parseCookieValue(s); - return $.isFunction(converter) ? converter(value) : value; - } - - var config = $.cookie = function (key, value, options) { - - // Write - - if (value !== undefined && !$.isFunction(value)) { - options = $.extend({}, config.defaults, options); - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setTime(+t + days * 864e+5); - } - - return (document.cookie = [ - encode(key), '=', stringifyCookieValue(value), - options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE - options.path ? '; path=' + options.path : '', - options.domain ? '; domain=' + options.domain : '', - options.secure ? '; secure' : '' - ].join('')); - } - - // Read - - var result = key ? undefined : {}; - - // To prevent the for loop in the first place assign an empty array - // in case there are no cookies at all. Also prevents odd result when - // calling $.cookie(). - var cookies = document.cookie ? document.cookie.split('; ') : []; - - for (var i = 0, l = cookies.length; i < l; i++) { - var parts = cookies[i].split('='); - var name = decode(parts.shift()); - var cookie = parts.join('='); - - if (key && key === name) { - // If second argument (value) is a function it's a converter... - result = read(cookie, value); - break; - } - - // Prevent storing a cookie that we couldn't decode. - if (!key && (cookie = read(cookie)) !== undefined) { - result[name] = cookie; - } - } - - return result; - }; - - config.defaults = {}; - - $.removeCookie = function (key, options) { - if ($.cookie(key) === undefined) { - return false; - } - - // Must not alter options, thus extending a fresh object... - $.cookie(key, '', $.extend({}, options, { expires: -1 })); - return !$.cookie(key); - }; - -})); diff --git a/public/static/jquery/lazyload.min.js b/public/static/jquery/lazyload.min.js deleted file mode 100755 index d76e8af..0000000 --- a/public/static/jquery/lazyload.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! Lazy Load 2.0.0-rc.2 - MIT license - Copyright 2007-2019 Mika Tuupola */ -!function(t,e){"object"==typeof exports?module.exports=e(t):"function"==typeof define&&define.amd?define([],e):t.LazyLoad=e(t)}("undefined"!=typeof global?global:this.window||this.global,function(t){"use strict";function e(t,e){this.settings=s(r,e||{}),this.images=t||document.querySelectorAll(this.settings.selector),this.observer=null,this.init()}"function"==typeof define&&define.amd&&(t=window);const r={src:"data-src",srcset:"data-srcset",selector:".lazyload",root:null,rootMargin:"0px",threshold:0},s=function(){let t={},e=!1,r=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(e=arguments[0],r++);for(;r