Version 3.3.3

压缩与合并js与css文件，js与src原文件移至src目录下
sqlsec · Jan 29, 2016 · 99da469 · 99da469
1 parent da79808
commit 99da469
Show file tree

Hide file tree

Showing 71 changed files with 139 additions and 71 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 如从旧版本升级，请务必先阅读Readme
 
 ## 平台说明
-本平台设计理念: 简单配置即可使用，无需数据库，无需其他组件支持，可直接在php虚拟空间使用，由于SAE空间限制了IO读写，需要做相应的修改，将文件写入memcache或者kvdb
+本平台设计理念: 简单配置即可使用，无需数据库，无需其他组件支持，可直接在php虚拟空间使用，由于SAE空间限制了IO读写，需要做相应的修改，将文件写入memcache或者kvdb或者Storage（to do）
 ![](./guide/mainpanel.png)
 
 ##安装说明
@@ -155,17 +155,25 @@ define('MAIL_RECV', "[email protected]");//接收通知的邮件地址
 6. 升级完成
 
 ## TODO
+* 支持SAE
 * 多用户（SQL版本）
 * WebSocket方式通知
 
+## src目录说明
+
+* static/js与static/css下的js与css文件已压缩
+* 其中`jqxcore.js、jqxdata.js、jqxgrid.js、jqxgrid.columnsresize.js、jqxgrid.filter.js、jqxgrid.edit.js、jqxgrid.pager.js、jqxgrid.selection.js、jqxgrid.sort.js、jqxbuttons.js、jqxcombobox.js、jqxdropdownlist.js、jqxinput.js、jqxlistbox.js、jqxmenu.js、jqxscrollbar.js、jqxsplitter.js、jqxtabs.js、jqxtextarea.js、jqxtoolbar.js、jqxwindow.js`合并为`jqwidgets.min.js`
+* `jqx.base.css、jqx.office.css`合并为`jqx.min.css`
+* css与js源文件移至src目录下，方便二次开发
+
 ## 特别说明
 * 前端使用[Bootstrap](http://getbootstrap.com/)与[jQWidgets](http://www.jqwidgets.com/)开发，（原来用kendo UI，受限于商业许可，改用jQWidgets），`you can use jQWidgets for free under the Creative Commons Attribution-NonCommercial 3.0 License`, 但是不可用于商业用途，如需用于商业用途请购买授权
 * 为实现jqxgrid不支持的功能，如固定表格高度实现row高度自动调节，修改了jQWidgets部分代码，具体修改部分可查看diff文件夹
-* 为方便开发与调试，未合并压缩js与css，待最终版发布后合并
 * 使用纯真ip库的函数基于Discuz X3.1 function_misc.php上修改而来, 判断客户端操作系统与浏览器的脚本基于原作者@author  Jea杨写的php版本修改而来，后台整体布局借鉴Kendo UI 的demo NORTHWIND DASH
 * js代码格式化使用[js_beautify](https://github.com/beautify-web/js-beautify)库
 * js代码压缩采用jsmin.js
 * js代码编辑器采用[ace](https://ace.c9.io)
+* 安装脚本完全参考[wordpress](https://cn.wordpress.org/)的安装程序
 * **Warning: 本工具仅允许使用在CTF比赛等学习、研究场景，严禁用于非法用途**
 
 ## 意见与建议

diff --git a/admin.php b/admin.php
@@ -10,11 +10,10 @@
 
     <title>控制面板</title>
     <link rel="stylesheet" href="static/css/bootstrap.min.css" type="text/css" />
-    <link rel="stylesheet" href="static/css/main.css" type="text/css" />
-    <link rel="stylesheet" href="static/css/notification.css" type="text/css" />
-    <link rel="stylesheet" href="static/css/jqx.base.css" type="text/css" />
-    <link rel="stylesheet" href="static/css/jqx.office.css" type="text/css" />
-    <link rel="stylesheet" href="static/css/animate.css" type="text/css" />
+    <link rel="stylesheet" href="static/css/main.min.css" type="text/css" />
+    <link rel="stylesheet" href="static/css/notification.min.css" type="text/css" />
+    <link rel="stylesheet" href="static/css/jqx.min.css" type="text/css" />
+    <link rel="stylesheet" href="static/css/animate.min.css" type="text/css" />
 
 
 
@@ -369,42 +368,22 @@
 	<script type="text/javascript" src="static/js/jquery-ui.min.js"></script>
     <script type="text/javascript" src="static/js/bootstrap.min.js"></script>
 
-	<script type="text/javascript" src="static/js/beautify.js"></script>
+	<script type="text/javascript" src="static/js/beautify.min.js"></script>
 	<script type="text/javascript" src="static/js/ZeroClipboard.min.js"></script>
 	<script type="text/javascript" src="static/js/ace.js"></script>
-	<script type="text/javascript" src="static/js/jsmin.js"></script>
-	<script type="text/javascript" src="static/js/js_encode.js"></script>
+	<script type="text/javascript" src="static/js/jsmin.min.js"></script>
+	<script type="text/javascript" src="static/js/js_encode.min.js"></script>
 
 
-    <script type="text/javascript" src="static/js/jqxcore.js"></script>
-    <script type="text/javascript" src="static/js/jqxdata.js"></script>
-    <script type="text/javascript" src="static/js/jqxbuttons.js"></script>
-    <script type="text/javascript" src="static/js/jqxscrollbar.js"></script>
-    <script type="text/javascript" src="static/js/jqxmenu.js"></script>
-    <script type="text/javascript" src="static/js/jqxgrid.js"></script>
-    <script type="text/javascript" src="static/js/jqxgrid.selection.js"></script>
-    <script type="text/javascript" src="static/js/jqxgrid.edit.js"></script>
-    <script type="text/javascript" src="static/js/jqxgrid.sort.js"></script>
-    <script type="text/javascript" src="static/js/jqxtabs.js"></script>
-    <script type="text/javascript" src="static/js/jqxgrid.columnsresize.js"></script>
-    <script type="text/javascript" src="static/js/jqxwindow.js"></script>
-    <script type="text/javascript" src="static/js/jqxdropdownlist.js"></script>
-    <script type="text/javascript" src="static/js/jqxgrid.pager.js"></script>
-    <script type="text/javascript" src="static/js/jqxlistbox.js"></script>
-    <script type="text/javascript" src="static/js/jqxgrid.filter.js"></script>
-    <script type="text/javascript" src="static/js/jqxsplitter.js"></script>
-	<script type="text/javascript" src="static/js/jqxtoolbar.js"></script>
-	<script type="text/javascript" src="static/js/jqxcombobox.js"></script>
-	<script type="text/javascript" src="static/js/jqxinput.js"></script>
-	<script type="text/javascript" src="static/js/jqxtextarea.js"></script>
+    <script type="text/javascript" src="static/js/jqwidgets.min.js"></script>
 
-    <script type="text/javascript" src="static/js/getTheme.js"></script>
-    <script type="text/javascript" src="static/js/localization.js"></script>
+    <script type="text/javascript" src="static/js/getTheme.min.js"></script>
+    <script type="text/javascript" src="static/js/localization.min.js"></script>
 
-    <script type="text/javascript" src="static/js/loadxsspanel.js"></script>
-    <script type="text/javascript" src="static/js/loadjstemplate.js"></script>
-	<script type="text/javascript" src="static/js/loadmyjs.js"></script>
-    <script type="text/javascript" src="static/js/notification.js"></script>
+    <script type="text/javascript" src="static/js/loadxsspanel.min.js"></script>
+    <script type="text/javascript" src="static/js/loadjstemplate.min.js"></script>
+	<script type="text/javascript" src="static/js/loadmyjs.min.js"></script>
+    <script type="text/javascript" src="static/js/notification.min.js"></script>
 
 </body>
 

diff --git a/install.php b/install.php
@@ -206,7 +206,7 @@ function display_header() {
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="robots" content="noindex,nofollow" />
 	<title>安装</title>
-	<link rel="stylesheet" href="static/css/install.css" type="text/css" />
+	<link rel="stylesheet" href="static/css/install.min.css" type="text/css" />
 </head>
 <body class="core-ui">
 <p id="logo">

diff --git a/login.php b/login.php
@@ -107,11 +107,11 @@ function generate_password($length = 32) {
     <head>
         <meta charset="utf-8" />
 		<title>登录</title>
-		<link rel="stylesheet" href='static/css/font-awesome.css' type="text/css" >
-		<link rel="stylesheet" href="static/css/login.css" type="text/css" />
+		<link rel="stylesheet" href='static/css/font-awesome.min.css' type="text/css" >
+		<link rel="stylesheet" href="static/css/login.min.css" type="text/css" />
 
         <script type="text/javascript" src="static/js/jquery.min.js" ></script>
-        <script type="text/javascript" src="static/js/login.js" ></script>
+        <script type="text/javascript" src="static/js/login.min.js" ></script>
 		<?php
 if ($is_pass_wrong)
     echo '<script type="text/javascript" src="static/js/pass_is_wrong.js" ></script>';

diff --git a/static/css/animate.css → src/css/animate.css b/static/css/animate.css → src/css/animate.css
diff --git a/src/css/bootstrap.min.css b/src/css/bootstrap.min.css
diff --git a/static/css/font-awesome.css → src/css/font-awesome.css b/static/css/font-awesome.css → src/css/font-awesome.css
diff --git a/static/css/install.css → src/css/install.css b/static/css/install.css → src/css/install.css
diff --git a/static/css/jqx.base.css → src/css/jqx.base.css b/static/css/jqx.base.css → src/css/jqx.base.css
diff --git a/static/css/jqx.office.css → src/css/jqx.office.css b/static/css/jqx.office.css → src/css/jqx.office.css
diff --git a/static/css/login.css → src/css/login.css b/static/css/login.css → src/css/login.css
diff --git a/static/css/main.css → src/css/main.css b/static/css/main.css → src/css/main.css
diff --git a/static/css/notification.css → src/css/notification.css b/static/css/notification.css → src/css/notification.css
diff --git a/src/js/ZeroClipboard.min.js b/src/js/ZeroClipboard.min.js
diff --git a/src/js/ace.js b/src/js/ace.js
diff --git a/static/js/beautify.js → src/js/beautify.js b/static/js/beautify.js → src/js/beautify.js
diff --git a/src/js/bootstrap.min.js b/src/js/bootstrap.min.js
diff --git a/static/js/getTheme.js → src/js/getTheme.js b/static/js/getTheme.js → src/js/getTheme.js
diff --git a/src/js/jquery-ui.min.js b/src/js/jquery-ui.min.js
diff --git a/src/js/jquery.min.js b/src/js/jquery.min.js
diff --git a/static/js/jqxbuttons.js → src/js/jqxbuttons.js b/static/js/jqxbuttons.js → src/js/jqxbuttons.js
diff --git a/static/js/jqxcombobox.js → src/js/jqxcombobox.js b/static/js/jqxcombobox.js → src/js/jqxcombobox.js
diff --git a/static/js/jqxcore.js → src/js/jqxcore.js b/static/js/jqxcore.js → src/js/jqxcore.js
diff --git a/static/js/jqxdata.js → src/js/jqxdata.js b/static/js/jqxdata.js → src/js/jqxdata.js
diff --git a/static/js/jqxdropdownlist.js → src/js/jqxdropdownlist.js b/static/js/jqxdropdownlist.js → src/js/jqxdropdownlist.js
diff --git a/static/js/jqxgrid.columnsresize.js → src/js/jqxgrid.columnsresize.js b/static/js/jqxgrid.columnsresize.js → src/js/jqxgrid.columnsresize.js
diff --git a/static/js/jqxgrid.edit.js → src/js/jqxgrid.edit.js b/static/js/jqxgrid.edit.js → src/js/jqxgrid.edit.js
diff --git a/static/js/jqxgrid.filter.js → src/js/jqxgrid.filter.js b/static/js/jqxgrid.filter.js → src/js/jqxgrid.filter.js
diff --git a/static/js/jqxgrid.js → src/js/jqxgrid.js b/static/js/jqxgrid.js → src/js/jqxgrid.js
diff --git a/static/js/jqxgrid.pager.js → src/js/jqxgrid.pager.js b/static/js/jqxgrid.pager.js → src/js/jqxgrid.pager.js
diff --git a/static/js/jqxgrid.selection.js → src/js/jqxgrid.selection.js b/static/js/jqxgrid.selection.js → src/js/jqxgrid.selection.js
diff --git a/static/js/jqxgrid.sort.js → src/js/jqxgrid.sort.js b/static/js/jqxgrid.sort.js → src/js/jqxgrid.sort.js
diff --git a/static/js/jqxinput.js → src/js/jqxinput.js b/static/js/jqxinput.js → src/js/jqxinput.js
diff --git a/static/js/jqxlistbox.js → src/js/jqxlistbox.js b/static/js/jqxlistbox.js → src/js/jqxlistbox.js
diff --git a/static/js/jqxmenu.js → src/js/jqxmenu.js b/static/js/jqxmenu.js → src/js/jqxmenu.js
diff --git a/static/js/jqxscrollbar.js → src/js/jqxscrollbar.js b/static/js/jqxscrollbar.js → src/js/jqxscrollbar.js
diff --git a/static/js/jqxsplitter.js → src/js/jqxsplitter.js b/static/js/jqxsplitter.js → src/js/jqxsplitter.js
diff --git a/static/js/jqxtabs.js → src/js/jqxtabs.js b/static/js/jqxtabs.js → src/js/jqxtabs.js
diff --git a/static/js/jqxtextarea.js → src/js/jqxtextarea.js b/static/js/jqxtextarea.js → src/js/jqxtextarea.js
diff --git a/static/js/jqxtoolbar.js → src/js/jqxtoolbar.js b/static/js/jqxtoolbar.js → src/js/jqxtoolbar.js
diff --git a/static/js/jqxwindow.js → src/js/jqxwindow.js b/static/js/jqxwindow.js → src/js/jqxwindow.js
diff --git a/static/js/js_encode.js → src/js/js_encode.js b/static/js/js_encode.js → src/js/js_encode.js
diff --git a/static/js/jsmin.js → src/js/jsmin.js b/static/js/jsmin.js → src/js/jsmin.js
diff --git a/static/js/loadjstemplate.js → src/js/loadjstemplate.js b/static/js/loadjstemplate.js → src/js/loadjstemplate.js
@@ -35,10 +35,10 @@ $(document).ready(function() {
             name: "js_name_abbr"
         }, {
             name: "js_description_abbr"
-        }, ],
+        } ],
 
         id: "js_name",
-        url: urlbase + "?js_template_cmd=list",
+        url: urlbase + "?js_template_cmd=list"
     };
 
     jsTemplate_dataAdapter = new $.jqx.dataAdapter(jsTemplate_source, {
@@ -195,17 +195,16 @@ $(document).ready(function() {
                         }
 
                     },
-                    complete: function(XMLHttpRequest, status) {　　　　
-                        if (status == 'timeout')　　　 {
+                    complete: function(XMLHttpRequest, status) {
+                        if (status == 'timeout') {
                             $('#failedWindow').jqxWindow('open');
                             $("#failedWindow").addClass('animated');
                         } else if (status == "parsererror") {
-                            window.location.href = "login.php";　
-                        }　
+                            window.location.href = "login.php";
+                        }
                     }
                 });
             }
-
         }
     });
 

diff --git a/static/js/loadmyjs.js → src/js/loadmyjs.js b/static/js/loadmyjs.js → src/js/loadmyjs.js
@@ -31,10 +31,10 @@ $(document).ready(function() {
             name: "js_name_abbr"
         }, {
             name: "js_description_abbr"
-        }, ],
+        } ],
 
         id: "js_name",
-        url: urlbase + "?my_js_cmd=list",
+        url: urlbase + "?my_js_cmd=list"
     };
 
     var myJS_dataAdapter = new $.jqx.dataAdapter(myJS_source, {
@@ -515,12 +515,12 @@ $(document).ready(function() {
         isModal: true,
         modalOpacity: 0.3,
         autoOpen: false,
-        title: "XSS'OR js编码工具",
+        title: "XSS'OR js编码工具"
     });
 
     $("#Ww_B_0_textarea").jqxTextArea({
         height: 220,
-        width: 270,
+        width: 270
     });
 
     $("#rwb_b2").jqxButton();

diff --git a/static/js/loadxsspanel.js → src/js/loadxsspanel.js b/static/js/loadxsspanel.js → src/js/loadxsspanel.js
@@ -20,7 +20,7 @@ $(document).ready(function() {
         modalOpacity: 0.3,
         okButton: $('#deleteConfirm_ok'),
         cancelButton: $('#deleteConfirm_cancel'),
-        autoOpen: false,
+        autoOpen: false
     });
     $('#deleteConfirm_ok').jqxButton({
         width: '65px'
@@ -65,7 +65,7 @@ $(document).ready(function() {
         modalOpacity: 0.3,
         okButton: $('#clearConfirm_ok'),
         cancelButton: $('#clearConfirm_cancel'),
-        autoOpen: false,
+        autoOpen: false
     });
 
     $('#clearConfirm_ok').jqxButton({
@@ -110,7 +110,7 @@ $(document).ready(function() {
         modalOpacity: 0.3,
         okButton: $('#logoutConfirm_ok'),
         cancelButton: $('#logoutConfirm_cancel'),
-        autoOpen: false,
+        autoOpen: false
     });
 
     $('#logoutConfirm_ok').jqxButton({
@@ -138,7 +138,7 @@ $(document).ready(function() {
         isModal: true,
         modalOpacity: 0.3,
         okButton: $('#failed_ok'),
-        autoOpen: false,
+        autoOpen: false
     });
 
     $('#failed_ok').jqxButton({
@@ -277,10 +277,10 @@ $(document).ready(function() {
             name: 'request_date_and_time_string'
         }, {
             name: 'client'
-        }, ],
+        } ],
         id: 'request_time',
         url: urlbase + "?cmd=list",
-        root: 'data',
+        root: 'data'
     };
 
     //从接口获得数据后的处理，格式化时间与根据useragent判断客户端
@@ -309,7 +309,7 @@ $(document).ready(function() {
                 }
                 return data;
             }
-        },
+        }
     });
 
     //每行detail信息初始化
@@ -355,7 +355,7 @@ $(document).ready(function() {
                     name: 'decoded_value',
                     type: 'string',
                     map: '2'
-                }, ],
+                } ],
                 datatype: "array"
             };
             var get_source_dataAdapter = new $.jqx.dataAdapter(get_source);
@@ -383,15 +383,15 @@ $(document).ready(function() {
                     }, {
                         text: '解码',
                         datafield: 'decoded_value'
-                    },
+                    }
 
                 ] : [{
                     text: '键',
                     datafield: 'key'
                 }, {
                     text: '值',
                     datafield: 'value'
-                }, ]
+                } ]
             });
 
             //POST表
@@ -423,7 +423,7 @@ $(document).ready(function() {
                         name: 'decoded_value',
                         type: 'string',
                         map: '2'
-                    },
+                    }
 
                 ],
                 datatype: "array"
@@ -454,15 +454,15 @@ $(document).ready(function() {
                     }, {
                         text: '解码',
                         datafield: 'decoded_value'
-                    },
+                    }
 
                 ] : [{
                     text: '键',
                     datafield: 'key'
                 }, {
                     text: '值',
                     datafield: 'value'
-                }, ]
+                } ]
             });
 
             //COOKIE表
@@ -492,7 +492,7 @@ $(document).ready(function() {
                     name: 'decoded_value',
                     type: 'string',
                     map: '2'
-                }, ],
+                } ],
                 datatype: "array"
             };
             var cookie_source_dataAdapter = new $.jqx.dataAdapter(cookie_source);
@@ -520,13 +520,13 @@ $(document).ready(function() {
                 }, {
                     text: '解码',
                     datafield: 'decoded_value'
-                }, ] : [{
+                } ] : [{
                     text: '键',
                     datafield: 'key'
                 }, {
                     text: '值',
                     datafield: 'value'
-                }, ]
+                } ]
             });
 
             //HTTP Headers表
@@ -547,7 +547,7 @@ $(document).ready(function() {
                         name: 'value',
                         type: 'string',
                         map: '1'
-                    },
+                    }
 
                 ],
                 datatype: "array"
@@ -575,7 +575,7 @@ $(document).ready(function() {
                 }, {
                     text: '值',
                     datafield: 'value'
-                }, ]
+                } ]
             });
 
             //其他信息

diff --git a/static/js/localization.js → src/js/localization.js b/static/js/localization.js → src/js/localization.js
diff --git a/static/js/login.js → src/js/login.js b/static/js/login.js → src/js/login.js
diff --git a/src/js/mode-javascript.js b/src/js/mode-javascript.js
diff --git a/static/js/notification.js → src/js/notification.js b/static/js/notification.js → src/js/notification.js
@@ -50,7 +50,7 @@ function showNotification(newUnreadNum,lastedID,interval){
 				$("#newNotification").click(readNotification);
 
 				$('#unreadNum').text(unreadNum);
-				$("#notifications-bottom-right").addClass('animated bounceInUp');　　　　　 
+				$("#notifications-bottom-right").addClass('animated bounceInUp');
 			}
 		}
 	});	

diff --git a/src/js/pass_is_wrong.js b/src/js/pass_is_wrong.js
@@ -0,0 +1 @@
+alert("密码错误！");
diff --git a/src/js/theme-chrome.js b/src/js/theme-chrome.js
diff --git a/src/js/worker-javascript.js b/src/js/worker-javascript.js
diff --git a/static/css/animate.min.css b/static/css/animate.min.css
diff --git a/static/css/font-awesome.min.css b/static/css/font-awesome.min.css