7.1.12

Got99 · Nov 28, 2019 · dd2773a · dd2773a
1 parent ff39438
commit dd2773a
Show file tree

Hide file tree

Showing 98 changed files with 7,930 additions and 465 deletions.
diff --git a/BTPanel/__init__.py b/BTPanel/__init__.py
@@ -47,7 +47,7 @@
 app.secret_key = uuid.UUID(int=uuid.getnode()).hex[-12:]
 local_ip = None
 my_terms = {}
-
+sdb = None
 try:
     from flask_sqlalchemy import SQLAlchemy
     app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////dev/shm/session.db'
@@ -483,7 +483,7 @@ def files(pdata = None):
     import files
     filesObject = files.files()
     defs = ('CheckExistsFiles','GetExecLog','GetSearch','ExecShell','GetExecShellMsg','UploadFile','GetDir','CreateFile','CreateDir','DeleteDir','DeleteFile',
-            'CopyFile','CopyDir','MvFile','GetFileBody','SaveFileBody','Zip','UnZip','SearchFiles','upload','read_history',
+            'CopyFile','CopyDir','MvFile','GetFileBody','SaveFileBody','Zip','UnZip','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',
             'RemoveTask','ActionTask','Re_Recycle_bin','Get_Recycle_bin','Del_Recycle_bin','Close_Recycle_bin','Recycle_bin')
@@ -555,7 +555,7 @@ def ajax(pdata = None):
     if comReturn: return comReturn
     import ajax
     ajaxObject = ajax.ajax()
-    defs = ('change_phpmyadmin_ssl_port','set_phpmyadmin_ssl','get_phpmyadmin_ssl','check_user_auth','to_not_beta','get_beta_logs','apple_beta','GetApacheStatus','GetCloudHtml','get_load_average','GetOpeLogs','GetFpmLogs','GetFpmSlowLogs','SetMemcachedCache','GetMemcachedStatus','GetRedisStatus','GetWarning','SetWarning','CheckLogin','GetSpeed','GetAd','phpSort','ToPunycode','GetBetaStatus','SetBeta','setPHPMyAdmin','delClose','KillProcess','GetPHPInfo','GetQiniuFileList','UninstallLib','InstallLib','SetQiniuAS','GetQiniuAS','GetLibList','GetProcessList','GetNetWorkList','GetNginxStatus','GetPHPStatus','GetTaskCount','GetSoftList','GetNetWorkIo','GetDiskIo','GetCpuIo','CheckInstalled','UpdatePanel','GetInstalled','GetPHPConfig','SetPHPConfig')
+    defs = ('php_info','change_phpmyadmin_ssl_port','set_phpmyadmin_ssl','get_phpmyadmin_ssl','check_user_auth','to_not_beta','get_beta_logs','apple_beta','GetApacheStatus','GetCloudHtml','get_load_average','GetOpeLogs','GetFpmLogs','GetFpmSlowLogs','SetMemcachedCache','GetMemcachedStatus','GetRedisStatus','GetWarning','SetWarning','CheckLogin','GetSpeed','GetAd','phpSort','ToPunycode','GetBetaStatus','SetBeta','setPHPMyAdmin','delClose','KillProcess','GetPHPInfo','GetQiniuFileList','UninstallLib','InstallLib','SetQiniuAS','GetQiniuAS','GetLibList','GetProcessList','GetNetWorkList','GetNginxStatus','GetPHPStatus','GetTaskCount','GetSoftList','GetNetWorkIo','GetDiskIo','GetCpuIo','CheckInstalled','UpdatePanel','GetInstalled','GetPHPConfig','SetPHPConfig')
     return publicObject(ajaxObject,defs,None,pdata);
 
 @app.route('/system',methods=method_all)
@@ -849,7 +849,8 @@ def install():
         return redirect('/login')
     ret_login = os.path.join('/',admin_path)
     if admin_path == '/' or admin_path == '/bt': ret_login = '/login'
-
+    session['admin_path'] = False
+    session['login'] = False
     if request.method == method_get[0]:
         if not os.path.exists('install.pl'): return redirect(ret_login)
         data = {}

diff --git a/BTPanel/static/ace/ace.js b/BTPanel/static/ace/ace.js
diff --git a/BTPanel/static/ace/editor.config.json b/BTPanel/static/ace/editor.config.json
@@ -1 +1 @@
-{"fontSize":"12px","theme":"monokai"}
+{"fontSize":"13px","theme":"monokai"}
diff --git a/BTPanel/static/ace/styles/icons.css b/BTPanel/static/ace/styles/icons.css
@@ -22,6 +22,12 @@
   font-weight: normal;
   font-style: normal;
 }
+@font-face {
+  font-family: octicons;
+  src: url("../icons/octicons.woff2");
+  font-weight: normal;
+  font-style: normal;
+}
 .binary-icon:before {
   font-family: "Octicons Regular";
   font-size: 16px;
@@ -110,12 +116,6 @@
   top: 1px;
   content: "\f0b0";
 }
-.markdown-icon:before {
-  font-family: "Octicons Regular";
-  font-size: 16px;
-  top: 1px;
-  content: "\f0c9";
-}
 .package-icon:before {
   font-family: "Octicons Regular";
   font-size: 16px;
@@ -698,7 +698,8 @@
   top: 3px;
   content: "\e618";
 }
-.perl-icon:before {
+.perl-icon:before{
+  color: #ff9800;
   font-family: Devicons;
   font-size: 16px;
   top: 3px;
@@ -4914,5 +4915,28 @@
 .sh-icon:before{
 	color: #aa759f;
 	content: '\f0c8';
-	font-family: file-icons;
+  font-family: file-icons;
+  font-size: 14px;
+}
+.text-icon:before{
+  color: #cccccc;
+  content: '\f011';
+  font-family: octicons;
+}
+
+.compress-icon:before{
+  color: #46788d;
+  content: '\f013';
+  font-family: octicons;
 }
+
+.images-icon:before{
+  color: #d28445;
+  content: '\f012';
+  font-family: octicons;
+}
+.markdown-icon:before {
+  color: #6a9fb5;
+  font-family: octicons;
+  content: "\f0c9";
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"fontSize":"12px","theme":"monokai"}
		{"fontSize":"13px","theme":"monokai"}