diff --git a/class/core/public.py b/class/core/public.py index 5b53472c0..e8e3bfa98 100755 --- a/class/core/public.py +++ b/class/core/public.py @@ -287,22 +287,12 @@ def writeLog(type, logMsg, args=()): import time import db import json - logMessage = json.loads( - readFile('static/language/' + getLanguage() + '/log.json')) - keys = logMessage.keys() - if logMsg in keys: - logMsg = logMessage[logMsg] - for i in range(len(args)): - rep = '{' + str(i + 1) + '}' - logMsg = logMsg.replace(rep, args[i]) - if type in keys: - type = logMessage[type] sql = db.Sql() mDate = time.strftime('%Y-%m-%d %X', time.localtime()) data = (type, logMsg, mDate) result = sql.table('logs').add('type,log,addtime', data) - except: - pass + except Exception as e: + print e def writeFile(filename, str): diff --git a/route/static/app/files.js b/route/static/app/files.js index 4cfe630ee..43ca0a663 100755 --- a/route/static/app/files.js +++ b/route/static/app/files.js @@ -13,7 +13,7 @@ function isDiskWidth(){ } //打开回收站 -function recycle_bin(type){ +function recycleBin(type){ $.post('/files?action=Get_Recycle_bin','',function(rdata){ var body = '' switch(type){ @@ -199,12 +199,12 @@ function recycle_bin(type){ \
\
\ -

'+lan.files.recycle_bin_type1+'

\ -

'+lan.files.recycle_bin_type2+'

\ -

'+lan.files.recycle_bin_type3+'

\ -

'+lan.files.recycle_bin_type4+'

\ -

'+lan.files.recycle_bin_type5+'

\ -

'+lan.files.recycle_bin_type6+'

\ +

全部

\ +

文件夹

\ +

'+lan.files.recycle_bin_type3+'

\ +

'+lan.files.recycle_bin_type4+'

\ +

'+lan.files.recycle_bin_type5+'

\ +

'+lan.files.recycle_bin_type6+'

\
\
\
\ @@ -231,10 +231,10 @@ function recycle_bin(type){ }); if(window.location.href.indexOf("database") != -1){ - Recycle_bin(6); + recycleBin(6); $(".re-con-menu p:last-child").addClass("on").siblings().removeClass("on"); }else{ - Recycle_bin(1); + recycleBin(1); } } $(".re-con-menu p").click(function(){ @@ -263,7 +263,7 @@ function reisImage(fileName){ function reRecycleBin(path,obj){ layer.confirm(lan.files.recycle_bin_re_msg,{title:lan.files.recycle_bin_re_title,closeBtn:2,icon:3},function(){ var loadT = layer.msg(lan.files.recycle_bin_re_the,{icon:16,time:0,shade: [0.3, '#000']}); - $.post('/files?action=Re_Recycle_bin','path='+encodeURIComponent(path),function(rdata){ + $.post('/files?action=Re_recycleBin','path='+encodeURIComponent(path),function(rdata){ layer.close(loadT); layer.msg(rdata.msg,{icon:rdata.status?1:5}); $(obj).parents('tr').remove(); @@ -309,7 +309,7 @@ function Set_Recycle_bin(db){ $.post('/files?action=Recycle_bin',data,function(rdata){ layer.close(loadT); layer.msg(rdata.msg,{icon:rdata.status?1:5}); - }); + },'json'); } @@ -321,19 +321,23 @@ function getFiles(Path) { if(isNaN(Path)){ var p = '1'; Path = encodeURIComponent(Path); - }else{ - var p = Path; + console.log(1,Path); + } else { + var p = '1'; Path = getCookie('open_dir_path'); + console.log(2,Path); } console.log(Path); var search = ''; var searchV = $("#SearchValue").val(); - if(searchV.length > 1 && searchtype == "1"){ + if(searchV.length > 1 && searchtype == '1'){ search = "&search="+searchV; } var showRow = getCookie('showRow'); - if(!showRow) showRow = '100'; + if(!showRow) { + showRow = '100'; + } var Body = ''; var data = 'path=' + Path; var loadT = layer.load(); @@ -366,7 +370,7 @@ function getFiles(Path) { } } var timetext ='--'; - if(getCookie("rank") == "a"){ + if(getCookie('rank') == 'a'){ $("#set_list").addClass("active"); $("#set_icon").removeClass("active"); Body += "\ @@ -377,15 +381,14 @@ function getFiles(Path) { "+fmp[3]+"\ "+fmp[4]+"\ \ - "+lan.files.file_menu_copy+" | \ - "+lan.files.file_menu_mv+" | \ - "+lan.files.file_menu_rename+" | \ - "+lan.files.file_menu_auth+" | \ - "+lan.files.file_menu_zip+" | \ - "+lan.files.file_menu_del+"\ + 复制 | \ + 剪切 | \ + 重命名 | \ + 权限 | \ + 压缩 | \ + 删除\ "; - } - else{ + } else { $("#set_icon").addClass("active"); $("#set_list").removeClass("active"); Body += "
\ @@ -414,12 +417,14 @@ function getFiles(Path) { if(displayZip != -1){ bodyZip = ""+lan.files.file_menu_unzip+" | "; } + if(isText(fmp[0])){ bodyZip = "编辑 | "; } + if(isImage(fmp[0])){ download = "预览 | "; - }else{ + } else { download = "下载 | "; } @@ -789,7 +794,7 @@ function getDisk() { for (var i = 0; i < rdata.length; i++) { LBody += " " + (rdata[i].path=='/'?lan.files.path_root:rdata[i].path) + "(" + rdata[i].size[2] + ")"; } - var trash = ' 回收站'; + var trash = ' 回收站'; $("#comlist").html(LBody+trash); isDiskWidth(); },'json'); @@ -1003,8 +1008,7 @@ function ExecShell(action){ if(rdata.status){ $("#mExec").val(''); GetShellEcho(); - } - else{ + } else { layer.msg(rdata.msg,{icon:rdata.status?1:2}); } diff --git a/route/static/app/public.js b/route/static/app/public.js index 5ebb1e237..38efe960d 100755 --- a/route/static/app/public.js +++ b/route/static/app/public.js @@ -339,7 +339,7 @@ function setCookie(a, c) { var b = 30; var d = new Date(); d.setTime(d.getTime() + b * 24 * 60 * 60 * 1000); - document.cookie = a + "=" + escape(c) + ";expires=" + d.toGMTString() + document.cookie = a + "=" + escape(c) + ";path=/;expires=" + d.toGMTString(); } function getCookie(b) { diff --git a/route/static/app/site.js b/route/static/app/site.js index 64d0e8403..55d5f02de 100755 --- a/route/static/app/site.js +++ b/route/static/app/site.js @@ -6,10 +6,10 @@ function getWeb(page, search) { search = $("#SearchValue").prop("value"); page = page == undefined ? '1':page; - order = getCookie('order'); + var order = getCookie('order'); if(order){ order = '&order=' + order; - }else{ + } else { order = ''; } @@ -170,7 +170,7 @@ function webAdd(type) { var defaultPath = $("#defaultPath").html(); var php_version = "
"+lan.site.php_ver+"