diff --git a/admin/appmarket/appupgrade.php b/admin/appmarket/appupgrade.php index c04c32d..5d2519b 100644 --- a/admin/appmarket/appupgrade.php +++ b/admin/appmarket/appupgrade.php @@ -21,7 +21,7 @@ $tagid = intval($_GET['tagid']); $group = intval($_GET['group']); $page = empty($_GET['page']) ? 1 : intval($_GET['page']); $perpage = 20; -$gets = array('mod' => 'appmarket', 'keyword' => $keyword, 'tagid' => $tagid, 'group' => $group); +$gets = array('mod' => MOD_NAME, 'keyword' => $keyword, 'tagid' => $tagid, 'group' => $group); $theurl = BASESCRIPT . "?" . url_implode($gets); $refer = urlencode($theurl . '&page=' . $page); diff --git a/admin/appmarket/default.php b/admin/appmarket/default.php index d0451f5..c604b4f 100644 --- a/admin/appmarket/default.php +++ b/admin/appmarket/default.php @@ -61,7 +61,7 @@ $keyword = trim($_GET['keyword']); $page = empty($_GET['page']) ? 1 : intval($_GET['page']); $perpage = 20; -$gets = array('mod' => 'appmarket', 'op' => 'default', 'keyword' => $keyword, 'depid' => $depid, 'group' => $group, 'position' => $position, ); +$gets = array('mod' => MOD_NAME, 'op' => 'default', 'keyword' => $keyword, 'depid' => $depid, 'group' => $group, 'position' => $position, ); $theurl = BASESCRIPT . "?" . url_implode($gets); $refer = urlencode($theurl . '&page=' . $page); diff --git a/admin/appmarket/extopen.php b/admin/appmarket/extopen.php index ab763eb..7b016e3 100644 --- a/admin/appmarket/extopen.php +++ b/admin/appmarket/extopen.php @@ -50,7 +50,7 @@ $appid = intval($_GET['appid']); $page = empty($_GET['page']) ? 1 : intval($_GET['page']); $perpage = 20; -$gets = array('mod' => 'appmarket', 'op' => 'extopen', 'ext' => $ext, 'appid' => $appid); +$gets = array('mod' => MOD_NAME, 'op' => 'extopen', 'ext' => $ext, 'appid' => $appid); $theurl = BASESCRIPT . "?" . url_implode($gets); $refer = urlencode($theurl . '&page=' . $page); diff --git a/admin/appmarket/import.php b/admin/appmarket/import.php index 679c3a2..10cf25e 100644 --- a/admin/appmarket/import.php +++ b/admin/appmarket/import.php @@ -15,7 +15,7 @@ $do = empty($_GET['do']) ? 'available' : trim($_GET['do']); $page = empty($_GET['page']) ? 1 : intval($_GET['page']); $perpage = 20; -$gets = array('mod' => 'app', 'op' => 'import', 'do' => $do, ); +$gets = array('mod' => MOD_NAME, 'op' => 'import', 'do' => $do, ); $theurl = BASESCRIPT . "?" . url_implode($gets); $refer = urlencode($theurl . '&page=' . $page); diff --git a/admin/appmarket/index.php b/admin/appmarket/index.php index 7cfd9fc..c9e016c 100644 --- a/admin/appmarket/index.php +++ b/admin/appmarket/index.php @@ -33,7 +33,7 @@ $tagid = intval($_GET['tagid']); $group = intval($_GET['group']); $page = empty($_GET['page']) ? 1 : intval($_GET['page']); $perpage = 20; -$gets = array('mod' => 'appmarket', 'keyword' => $keyword, 'tagid' => $tagid, 'group' => $group); +$gets = array('mod' => MOD_NAME, 'keyword' => $keyword, 'tagid' => $tagid, 'group' => $group); $theurl = BASESCRIPT . "?" . url_implode($gets); $refer = urlencode($theurl . '&page=' . $page); diff --git a/admin/appmarket/template/appdefault.htm b/admin/appmarket/template/appdefault.htm index 8e1404d..06ff25e 100644 --- a/admin/appmarket/template/appdefault.htm +++ b/admin/appmarket/template/appdefault.htm @@ -15,25 +15,25 @@
-
+ diff --git a/admin/appmarket/template/cloudappmarket.htm b/admin/appmarket/template/cloudappmarket.htm index 44157db..f3309fc 100644 --- a/admin/appmarket/template/cloudappmarket.htm +++ b/admin/appmarket/template/cloudappmarket.htm @@ -93,7 +93,7 @@
-
{lang total}$total{lang ge}{lang app} +
{lang total}$total{lang ge}{lang app}
{lang manual_install_tip}
diff --git a/admin/appmarket/template/edit.htm b/admin/appmarket/template/edit.htm index 2566d70..4f45469 100644 --- a/admin/appmarket/template/edit.htm +++ b/admin/appmarket/template/edit.htm @@ -14,9 +14,6 @@ border: 1px solid #CCC; padding: 2px; } - .col-sm-2 col-form-label{ - padding-top: 7px; - } .btn-sorg { margin: 5px; } diff --git a/admin/appmarket/template/extopen.htm b/admin/appmarket/template/extopen.htm index 8ec19aa..d533398 100644 --- a/admin/appmarket/template/extopen.htm +++ b/admin/appmarket/template/extopen.htm @@ -58,7 +58,7 @@ $key
diff --git a/admin/appmarket/template/list_list_notinstall.htm b/admin/appmarket/template/list_list_notinstall.htm index 3396400..62ca482 100644 --- a/admin/appmarket/template/list_list_notinstall.htm +++ b/admin/appmarket/template/list_list_notinstall.htm @@ -18,7 +18,7 @@ diff --git a/admin/appmarket/template/list_list_upgrade.htm b/admin/appmarket/template/list_list_upgrade.htm index bbb807f..3ff3f4a 100644 --- a/admin/appmarket/template/list_list_upgrade.htm +++ b/admin/appmarket/template/list_list_upgrade.htm @@ -18,7 +18,7 @@ diff --git a/admin/appmarket/template/upgrade.htm b/admin/appmarket/template/upgrade.htm index aab2711..23e3963 100644 --- a/admin/appmarket/template/upgrade.htm +++ b/admin/appmarket/template/upgrade.htm @@ -104,7 +104,7 @@
diff --git a/admin/cloud/template/edit.htm b/admin/cloud/template/edit.htm index 7f1e5ce..c191e34 100644 --- a/admin/cloud/template/edit.htm +++ b/admin/cloud/template/edit.htm @@ -14,7 +14,7 @@
- +
@@ -41,10 +41,10 @@
@@ -52,7 +52,7 @@
- + @@ -87,7 +87,7 @@
- +
    diff --git a/admin/appmarket/template/header_search.htm b/admin/appmarket/template/header_search.htm index 953dfc5..a25a35b 100644 --- a/admin/appmarket/template/header_search.htm +++ b/admin/appmarket/template/header_search.htm @@ -1,7 +1,7 @@
    - - + + @@ -10,8 +10,8 @@
    - - + + @@ -23,7 +23,7 @@
    - + @@ -33,7 +33,7 @@
    - + diff --git a/admin/appmarket/template/import.htm b/admin/appmarket/template/import.htm index bed4be2..aa942b0 100644 --- a/admin/appmarket/template/import.htm +++ b/admin/appmarket/template/import.htm @@ -14,17 +14,17 @@
    - + - + + + +
    - +
    diff --git a/admin/appmarket/template/list.htm b/admin/appmarket/template/list.htm index 8848b9c..e87fce0 100644 --- a/admin/appmarket/template/list.htm +++ b/admin/appmarket/template/list.htm @@ -14,15 +14,15 @@
    - + - + + + +
    diff --git a/admin/appmarket/template/list_list_available.htm b/admin/appmarket/template/list_list_available.htm index 98e9139..3c54e52 100644 --- a/admin/appmarket/template/list_list_available.htm +++ b/admin/appmarket/template/list_list_available.htm @@ -27,10 +27,10 @@
$value[identifier] $value[vendor] - - - - + + + +
$value[identifier] $value[vendor] - {lang install} + {lang install}
$value[identifier] $value[vendor] - {lang nav_db_runquery} + {lang nav_db_runquery}
{lang set} + {lang set} - {lang delete} + {lang delete}
-
+
@@ -173,10 +173,10 @@
@@ -184,7 +184,7 @@
- + @@ -219,7 +219,7 @@ -
+
diff --git a/admin/cloud/template/left.htm b/admin/cloud/template/left.htm index 28499fd..108a3da 100644 --- a/admin/cloud/template/left.htm +++ b/admin/cloud/template/left.htm @@ -1,10 +1,10 @@ diff --git a/admin/cloud/template/movetool.htm b/admin/cloud/template/movetool.htm index 756573f..f741098 100644 --- a/admin/cloud/template/movetool.htm +++ b/admin/cloud/template/movetool.htm @@ -14,7 +14,7 @@
- +
diff --git a/admin/cloud/template/oauth_ALIOSS.htm b/admin/cloud/template/oauth_ALIOSS.htm index cd5bf6a..8e854b5 100644 --- a/admin/cloud/template/oauth_ALIOSS.htm +++ b/admin/cloud/template/oauth_ALIOSS.htm @@ -13,16 +13,16 @@
- + @@ -111,7 +111,7 @@ if(id == '' || key == '') { return; } - jQuery.getJSON('{BASESCRIPT}?mod=cloud&op=oauth&do=getBucket', { id: id, key: key }, function(json) { + jQuery.getJSON('{MOD_URL}&op=oauth&do=getBucket', { id: id, key: key }, function(json) { console.log(json); if(json.length > 0) { var html = ''; diff --git a/admin/cloud/template/oauth_disk.htm b/admin/cloud/template/oauth_disk.htm index f65ddfa..0278bf4 100644 --- a/admin/cloud/template/oauth_disk.htm +++ b/admin/cloud/template/oauth_disk.htm @@ -10,14 +10,14 @@
- + diff --git a/admin/cloud/template/oauth_ftp.htm b/admin/cloud/template/oauth_ftp.htm index f555a67..740d2fa 100644 --- a/admin/cloud/template/oauth_ftp.htm +++ b/admin/cloud/template/oauth_ftp.htm @@ -14,14 +14,14 @@
- + diff --git a/admin/cloud/template/oauth_qcos.htm b/admin/cloud/template/oauth_qcos.htm index 242133d..7eabc68 100644 --- a/admin/cloud/template/oauth_qcos.htm +++ b/admin/cloud/template/oauth_qcos.htm @@ -13,16 +13,16 @@
- + @@ -104,7 +104,7 @@ if(id == '' || key == '' || region == '') { return; } - jQuery.getJSON('{BASESCRIPT}?mod=cloud&op=oauth&do=getBucket', { id: id, key: key,region:region,bz:bz }, function(json) { + jQuery.getJSON('{MOD_URL}&op=oauth&do=getBucket', { id: id, key: key,region:region,bz:bz }, function(json) { if(json.error){ showmessage(json.error); }else{ diff --git a/admin/cloud/template/oauth_qiniu.htm b/admin/cloud/template/oauth_qiniu.htm index 76d0387..bb54613 100644 --- a/admin/cloud/template/oauth_qiniu.htm +++ b/admin/cloud/template/oauth_qiniu.htm @@ -10,14 +10,14 @@
- + diff --git a/admin/cloud/template/right_header.htm b/admin/cloud/template/right_header.htm index 0ef14af..ba11184 100644 --- a/admin/cloud/template/right_header.htm +++ b/admin/cloud/template/right_header.htm @@ -1,10 +1,10 @@ \ No newline at end of file diff --git a/admin/cloud/template/router.htm b/admin/cloud/template/router.htm index 1923d5a..a03b34a 100644 --- a/admin/cloud/template/router.htm +++ b/admin/cloud/template/router.htm @@ -20,7 +20,7 @@
- + @@ -44,14 +44,14 @@ - + diff --git a/admin/cloud/template/routeredit.htm b/admin/cloud/template/routeredit.htm index bc742f2..e244237 100644 --- a/admin/cloud/template/routeredit.htm +++ b/admin/cloud/template/routeredit.htm @@ -13,14 +13,14 @@
- + diff --git a/admin/cloud/template/space.htm b/admin/cloud/template/space.htm index 0aded09..dd9204a 100644 --- a/admin/cloud/template/space.htm +++ b/admin/cloud/template/space.htm @@ -15,11 +15,11 @@
- +
$value[drouter] 0}-->checked>  
 {lang del}    - {lang add_routing} + {lang add_routing}
@@ -42,12 +42,12 @@ {lang space_storage_failure} - + -
0}-->style="display:none"class="text-danger" href="{BASESCRIPT}?mod=cloud&op=space&do=delete&remoteid=$value[remoteid]" onclick="if(confirm('{lang space_del_storage}')){return true;}else{return false}" >{lang delete}0}-->style="display:none"class="text-danger" href="{MOD_URL}&op=space&do=delete&remoteid=$value[remoteid]" onclick="if(confirm('{lang space_del_storage}')){return true;}else{return false}" >{lang delete}
{lang add_storage_location} + {lang add_storage_location}
diff --git a/admin/cloud/template/spaceadd.htm b/admin/cloud/template/spaceadd.htm index 80f6d31..4c90f6c 100644 --- a/admin/cloud/template/spaceadd.htm +++ b/admin/cloud/template/spaceadd.htm @@ -14,9 +14,9 @@
diff --git a/admin/member/images/member.css b/admin/member/images/member.css index ac21587..a4ac91a 100644 --- a/admin/member/images/member.css +++ b/admin/member/images/member.css @@ -2,29 +2,6 @@ padding:5px 0 0 10px; line-height:24px; } - -.classtree-search{ - position:absolute; - left:1px; - top:2px; - display:none; -} -.classtree-search .form-control{ - padding:5px 40px 5px 5px; -} -.classtree-search .form-control:focus{ - box-shadow:none; -} -.classtree-search .search{ - position:absolute; - right:28px; - top:8px; -} -.classtree-search .delete{ - position:absolute; - right:8px; - top:8px; -} /*重定义图标*/ .jstree-default a i{ _filter: Alpha(opacity=80); diff --git a/admin/member/template/verify.htm b/admin/member/template/verify.htm index eea5e51..22fc9f9 100644 --- a/admin/member/template/verify.htm +++ b/admin/member/template/verify.htm @@ -51,8 +51,8 @@
-
- + + diff --git a/admin/setting/template/assistant.htm b/admin/setting/template/assistant.htm index 9af441c..f552dd5 100644 --- a/admin/setting/template/assistant.htm +++ b/admin/setting/template/assistant.htm @@ -49,13 +49,13 @@
diff --git a/admin/setting/template/left.htm b/admin/setting/template/left.htm index 649070e..42e5aa4 100644 --- a/admin/setting/template/left.htm +++ b/admin/setting/template/left.htm @@ -1,26 +1,26 @@ \ No newline at end of file diff --git a/admin/setting/template/mailcheck.htm b/admin/setting/template/mailcheck.htm index 9e33754..d11342f 100644 --- a/admin/setting/template/mailcheck.htm +++ b/admin/setting/template/mailcheck.htm @@ -15,12 +15,12 @@
- +
diff --git a/admin/setting/template/main.htm b/admin/setting/template/main.htm index 2a76c32..2eafe66 100644 --- a/admin/setting/template/main.htm +++ b/admin/setting/template/main.htm @@ -70,122 +70,122 @@
- +
@@ -390,7 +390,7 @@ } - + @@ -427,7 +427,7 @@ -
+
@@ -477,7 +477,7 @@ }); - +
@@ -499,7 +499,7 @@ -
+ @@ -570,7 +570,7 @@ }) - +
@@ -590,14 +590,14 @@
- + {lang qq_app_id}
- + {lang qq_app_key}
@@ -627,7 +627,7 @@ -
+ @@ -715,7 +715,7 @@ }) - +
@@ -871,7 +871,7 @@ } - +
@@ -916,7 +916,7 @@ - +
@@ -1025,7 +1025,7 @@ selorg.openarr = openarr; }); - +
@@ -1102,7 +1102,7 @@ - +
@@ -1131,7 +1131,7 @@ -
+
@@ -1201,7 +1201,7 @@
- +
@@ -1443,7 +1443,7 @@ } - +
@@ -1465,7 +1465,7 @@ -
+ diff --git a/admin/setting/template/smiley.htm b/admin/setting/template/smiley.htm index 163876f..df3ffa7 100644 --- a/admin/setting/template/smiley.htm +++ b/admin/setting/template/smiley.htm @@ -15,12 +15,12 @@
- + diff --git a/admin/setting/template/smileyedit.htm b/admin/setting/template/smileyedit.htm index cf58520..7f55a71 100644 --- a/admin/setting/template/smileyedit.htm +++ b/admin/setting/template/smileyedit.htm @@ -21,18 +21,18 @@
- + diff --git a/admin/setting/template/wxsyn.htm b/admin/setting/template/wxsyn.htm index fe1a71d..df22d20 100644 --- a/admin/setting/template/wxsyn.htm +++ b/admin/setting/template/wxsyn.htm @@ -58,9 +58,9 @@
diff --git a/admin/system/template/cron.htm b/admin/system/template/cron.htm index 0597a71..8369423 100644 --- a/admin/system/template/cron.htm +++ b/admin/system/template/cron.htm @@ -18,16 +18,16 @@
@@ -48,7 +48,7 @@

    {lang board_message}

    {lang misc_cron_edit_tips}
- +
@@ -107,7 +107,7 @@
    {lang board_message}
    {lang misc_cron_tips}
- +
@@ -143,10 +143,10 @@
$cron[nextrun] - {lang edit} + {lang edit}
- {lang execute} + {lang execute} {lang execute} diff --git a/admin/systemlog/index.php b/admin/systemlog/index.php index 5c8196c..f326399 100644 --- a/admin/systemlog/index.php +++ b/admin/systemlog/index.php @@ -28,18 +28,17 @@ if($type=="list"){ $operationarr = array_keys($systemlog_setting); $operation = in_array($_GET['operation'], $operationarr) ? $_GET['operation'] : "cplog"; $navtitle=$systemlog_setting[$operation]["title"].' - '.lang('appname');//lang('nav_logs_'.$operation).' - '.lang('admin_navtitle'); - $page = (isset($_GET['page'])) ? intval($_GET['page']) : 1; + $page = (isset($_GET['page'])) ? intval($_GET['page']) : 1; $type = isset($_GET['type']) ? trim($_GET['type']) : ''; - $start = ($page - 1) * $lpp; - $gets = array( - 'mod' => 'systemlog', - 'type' => $type, + $start = ($page - 1) * $lpp; + $gets = array( + 'mod' => MOD_NAME, + 'type' => $type, 'operation' => $operation, 'lpp' => $lpp, - 'keyword' => $keyword, - ); - $theurl = BASESCRIPT . "?" . url_implode($gets); - $refer = $theurl . '&page=' . $page; + 'keyword' => $keyword, + ); + $theurl = BASESCRIPT . "?" . url_implode($gets); $logdir = DZZ_ROOT.'./data/log/'; $logfiles = get_log_files($logdir, $operation); diff --git a/admin/systemlog/template/header_search.htm b/admin/systemlog/template/header_search.htm index ee3b9cc..0a6bf94 100644 --- a/admin/systemlog/template/header_search.htm +++ b/admin/systemlog/template/header_search.htm @@ -1,12 +1,11 @@ - -
- - - - - - - +
+ + + + + + +
- +