Skip to content

Commit

Permalink
7.2.14
Browse files Browse the repository at this point in the history
  • Loading branch information
showpy committed Mar 30, 2020
1 parent f2650e7 commit bfcf1f5
Show file tree
Hide file tree
Showing 48 changed files with 2,309 additions and 739 deletions.
10 changes: 5 additions & 5 deletions BTPanel/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import public
from flask import Flask,current_app,session,render_template,send_file,request,redirect,g,url_for,make_response,render_template_string,abort
from flask_session import Session

try:
from werkzeug.contrib.cache import SimpleCache
except:
Expand All @@ -28,11 +27,11 @@
from flask_sockets import Sockets
sys.setrecursionlimit(1000000)
cache = SimpleCache()

from flask_compress import Compress
app = Flask(__name__,template_folder="templates/" + public.GetConfigValue('template'))
Compress(app)
sockets = Sockets(app)


import common
import db
import jobs
Expand Down Expand Up @@ -207,6 +206,7 @@ def reload_mod():
if result: return public.returnJson(True,result),json_header
return public.returnJson(False,'INIT_RELOAD_ERR'),json_header


@app.before_request
def request_check():
if not public.path_safe_check(request.path): return abort(404)
Expand Down Expand Up @@ -579,8 +579,8 @@ def files(pdata = None):
'CopyFile','CopyDir','MvFile','GetFileBody','SaveFileBody','Zip','UnZip','get_download_url_find',
'SearchFiles','upload','read_history','re_history','auto_save_temp','get_auto_save_body',
'GetFileAccess','SetFileAccess','GetDirSize','SetBatchData','BatchPaste','install_rar','get_path_size',
'DownloadFile','GetTaskSpeed','CloseLogs','InstallSoft','UninstallSoft','SaveTmpFile',
'GetTmpFile','del_files_store','add_files_store','get_files_store','del_files_store_types','add_files_store_types',
'DownloadFile','GetTaskSpeed','CloseLogs','InstallSoft','UninstallSoft','SaveTmpFile','get_composer_version','exec_composer','update_composer',
'GetTmpFile','del_files_store','add_files_store','get_files_store','del_files_store_types','add_files_store_types','exec_git',
'RemoveTask','ActionTask','Re_Recycle_bin','Get_Recycle_bin','Del_Recycle_bin','Close_Recycle_bin','Recycle_bin','file_webshell_check','dir_webshell_check'
)
return publicObject(filesObject,defs,None,pdata)
Expand Down
1 change: 1 addition & 0 deletions BTPanel/static/ace/ace.editor.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"supportedModes":{"Apache_Conf":["^htaccess|^htgroups|^htpasswd|^conf|htaccess|htgroups|htpasswd"],"BatchFile":["bat|cmd"],"C_Cpp":["cpp|c|cc|cxx|h|hh|hpp|ino"],"CSharp":["cs"],"CSS":["css"],"Dockerfile":["^Dockerfile"],"golang":["go"],"HTML":["html|htm|xhtml|vue|we|wpy"],"Java":["java"],"JavaScript":["js|jsm|jsx"],"JSON":["json"],"JSP":["jsp"],"LESS":["less"],"Lua":["lua"],"Makefile":["^Makefile|^GNUmakefile|^makefile|^OCamlMakefile|make"],"Markdown":["md|markdown"],"MySQL":["mysql"],"Nginx":["nginx|conf"],"INI":["ini|conf|cfg|prefs"],"ObjectiveC":["m|mm"],"Perl":["pl|pm"],"Perl6":["p6|pl6|pm6"],"pgSQL":["pgsql"],"PHP_Laravel_blade":["blade.php"],"PHP":["php|inc|phtml|shtml|php3|php4|php5|phps|phpt|aw|ctp|module"],"Powershell":["ps1"],"Python":["py"],"R":["r"],"Ruby":["rb|ru|gemspec|rake|^Guardfile|^Rakefile|^Gemfile"],"Rust":["rs"],"SASS":["sass"],"SCSS":["scss"],"SH":["sh|bash|^.bashrc"],"SQL":["sql"],"SQLServer":["sqlserver"],"Swift":["swift"],"Text":["txt"],"Typescript":["ts|typescript|str"],"VBScript":["vbs|vb"],"Verilog":["v|vh|sv|svh"],"XML":["xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl|xaml"],"YAML":["yaml|yml"],"Compress":["tar|zip|7z|rar|gz|arj|z"],"images":["icon|jpg|jpeg|png|bmp|gif|tif|emf"]},"nameOverrides":{"ObjectiveC":"Objective-C","CSharp":"C#","golang":"Go","C_Cpp":"C and C++","PHP_Laravel_blade":"PHP (Blade Template)","Perl6":"Perl 6"},"encodingList":["ASCII","UTF-8","GBK","GB2312","BIG5"],"themeList":["chrome","monokai"],"aceEditor":{"editorTheme":"monokai","fontSize":14,"softLabel":false,"useSoftTabs":false,"tabSize":4,"wrap":true,"enableSnippets":true,"enableLiveAutocompletion":true,"highlightActiveLine":true,"highlightSelectedWord":true,"animatedScroll":false,"showInvisibles":false,"showFoldWidgets":true,"showLineNumbers":true,"showGutter":true,"displayIndentGuides":false},"showUpdate":true}
2 changes: 1 addition & 1 deletion BTPanel/static/ace/editor.config.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"fontSize":"13px","theme":"monokai"}
{"fontSize":"12px","theme":"monokai"}
Loading

0 comments on commit bfcf1f5

Please sign in to comment.