diff --git a/BTPanel/static/js/files.js b/BTPanel/static/js/files.js index 297a7ba1..4bed4dab 100644 --- a/BTPanel/static/js/files.js +++ b/BTPanel/static/js/files.js @@ -801,7 +801,7 @@ function BatchPaste(){ for(var i=0;i'+ToSize(result[i].size)+''+getLocalTime(result[i].mtime)+''; } - var mbody = '
\ + var mbody = '
文件名大小最后修改时间
\ '+tbody+'\
文件名大小最后修改时间
'; SafeMessage('即将覆盖以下文件',mbody,function(){ diff --git a/class/panelSite.py b/class/panelSite.py index f2f2b297..8ffc49f9 100644 --- a/class/panelSite.py +++ b/class/panelSite.py @@ -2282,15 +2282,15 @@ def DelUserInI(self,path,up = 0): os.remove(useriniPath) for p1 in os.listdir(path): - npath = path + '/' + p1; - if not os.path.isdir(npath): continue - useriniPath = npath + '/.user.ini'; - if os.path.exists(useriniPath): - public.ExecShell('chattr -i ' + useriniPath); - os.remove(useriniPath) - - if up < 3: self.DelUserInI(npath, up + 1); - + try: + npath = path + '/' + p1; + if not os.path.isdir(npath): continue + useriniPath = npath + '/.user.ini'; + if os.path.exists(useriniPath): + public.ExecShell('chattr -i ' + useriniPath); + os.remove(useriniPath) + if up < 3: self.DelUserInI(npath, up + 1); + except: continue return True;