diff --git a/src/admin/catalog_edit.php b/src/admin/catalog_edit.php index 01b3416b..e60677e4 100644 --- a/src/admin/catalog_edit.php +++ b/src/admin/catalog_edit.php @@ -77,17 +77,17 @@ if ($dopost == "save") { } //修改子栏目属性 if (!empty($upnext)) { - $upquery = "UPDATE `#@__arctype` SET - issend='$issend', - defaultname='$defaultname', - channeltype='$channeltype', - tempindex='$tempindex', - templist='$templist', - temparticle='$temparticle', - namerule='$namerule', - namerule2='$namerule2', - ishidden='$ishidden' - WHERE 1=1 AND $slinks"; + $upquery = "UPDATE `#@__arctype` SET + issend='$issend', + defaultname='$defaultname', + channeltype='$channeltype', + tempindex='$tempindex', + templist='$templist', + temparticle='$temparticle', + namerule='$namerule', + namerule2='$namerule2', + ishidden='$ishidden' + WHERE 1=1 AND $slinks"; if (!$dsql->ExecuteNoneQuery($upquery)) { ShowMsg("修改当前栏目成功,但修改下级栏目属性时失败", "-1"); exit(); @@ -96,7 +96,7 @@ if ($dopost == "save") { UpDateCatCache(); ShowMsg("成功修改一个分类", "catalog_main.php"); exit(); -}//End Save Action +} //End Save Action else if ($dopost == "savetime") { $uptopsql = ''; $slinks = " id IN (".GetSonIds($id).")"; @@ -165,80 +165,76 @@ if ($dopost == 'time') { - + - - - - - - - + - - + + - - + + - - + + (仅限制栏目里的文档浏览权限) + - - + + - - + - - + + - - + +
- 当前是快捷编辑模式,如果您要修改更详细的参数,请使用高级模式>> + 是否支持投稿: + +
是否支持投稿: -   - -
内容模型: + 内容模型: $arr) { if ($k == $channelid) echo "{$arr['typename']} | {$arr['nid']}"; } ?> - [修改] + 更多模型
栏目名称:栏目名称:
排列顺序: (由低 -> 高) 排列顺序: (由低 -> 高)
浏览权限:浏览权限: + (仅限制栏目里的文档浏览权限)
文件保存目录:文件保存目录:
栏目列表选项: - - - + 栏目列表选项: + + +
默认页的名称: 默认页的名称:
栏目属性: -
-
-
栏目属性: +
+
+ +
- -     - + +
diff --git a/src/admin/content_list.php b/src/admin/content_list.php index f6b21fe6..660ce0e9 100644 --- a/src/admin/content_list.php +++ b/src/admin/content_list.php @@ -14,22 +14,17 @@ require_once(dirname(__FILE__).'/config.php'); require_once(DEDEINC.'/typelink.class.php'); require_once(DEDEINC.'/datalistcp.class.php'); require_once(DEDEADMIN.'/inc/inc_list_functions.php'); - $cid = isset($cid) ? intval($cid) : 0; $channelid = isset($channelid) ? intval($channelid) : 0; $mid = isset($mid) ? intval($mid) : 0; - if (!isset($keyword)) $keyword = ''; if (!isset($flag)) $flag = ''; if (!isset($f)) $f = ''; if (!isset($arcrank)) $arcrank = ''; if (!isset($dopost)) $dopost = ''; - $arcrank = RemoveXSS($arcrank); - //检查权限许可,总权限 CheckPurview('a_List,a_AccList,a_MyList'); - //栏目浏览许可 $userCatalogSql = ''; if (TestPurview('a_List')) {; @@ -47,7 +42,6 @@ $adminid = $cuserLogin->getUserID(); $maintable = '#@__archives'; setcookie('ENV_GOBACK_URL', $dedeNowurl, time() + 3600, '/'); $tl = new TypeLink($cid); - //---------------------------------------- //在不指定排序条件和关键字的情况下直接统计微表 //---------------------------------------- @@ -86,7 +80,6 @@ if (empty($totalresult) && empty($keyword) && empty($orderby) && empty($flag)) { $arr = $dsql->GetOne($sql); $totalresult = $arr['dd']; } - if ($cid == 0) { if ($channelid == 0) { $positionname = '所有栏目>'; @@ -99,7 +92,6 @@ if ($cid == 0) { } else { $positionname = str_replace($cfg_list_symbol, " > ", $tl->GetPositionName())." > "; } - //当选择的是单表模型栏目时,直接跳转到单表模型管理区 if ( empty($channelid) @@ -111,12 +103,9 @@ if ($channelid < -1) { header("location:content_sg_list.php?f=$f&cid=$cid&channelid=$channelid&keyword=$keyword"); exit(); } - - //栏目大于800则需要缓存数据 $optHash = md5($cid.serialize($admin_catalogs).$channelid); $optCache = DEDEDATA."/tplcache/inc_option_$optHash.inc"; - $typeCount = 0; if (file_exists($cache1)) require_once($cache1); else $cfg_Cs = array(); @@ -131,16 +120,12 @@ if ($typeCount > 800) { } else { $optionarr = $tl->GetOptionArray($cid, $admin_catalogs, $channelid); } - $whereSql = empty($channelid) ? " WHERE arc.channel > 0 AND arc.arcrank > -2 " : " WHERE arc.channel = '$channelid' AND arc.arcrank > -2 "; - $flagsArr = ''; $dsql->Execute('f', 'SELECT * FROM `#@__arcatt` ORDER BY sortid ASC'); while ($frow = $dsql->GetArray('f')) { $flagsArr .= ($frow['att'] == $flag ? "\r\n" : "\r\n"); } - - if (!empty($userCatalogSql)) { $whereSql .= " AND ".$userCatalogSql; } @@ -162,22 +147,17 @@ if ($arcrank != '') { } else { $CheckUserSend = ""; } - $orderby = empty($orderby) ? 'id' : preg_replace("#[^a-z0-9]#", "", $orderby); $orderbyField = 'arc.'.$orderby; - $query = "SELECT arc.id,arc.typeid,arc.senddate,arc.flag,arc.ismake, arc.channel,arc.arcrank,arc.click,arc.title,arc.color,arc.litpic,arc.pubdate,arc.mid FROM `$maintable` arc $whereSql ORDER BY $orderbyField DESC"; - if (empty($f) || !preg_match("#form#", $f)) $f = 'form1.arcid1'; - //初始化 $dlist = new DataListCP(); -$dlist->pageSize = 30; - +$dlist->pageSize = 40; //GET参数 $dlist->SetParameter('dopost', 'listArchives'); $dlist->SetParameter('keyword', $keyword); @@ -188,15 +168,11 @@ $dlist->SetParameter('orderby', $orderby); $dlist->SetParameter('arcrank', $arcrank); $dlist->SetParameter('channelid', $channelid); $dlist->SetParameter('f', $f); - //模板 if (empty($s_tmplets)) $s_tmplets = 'templets/content_list.htm'; $dlist->SetTemplate(DEDEADMIN.'/'.$s_tmplets); - //查询 $dlist->SetSource($query); - //显示 $dlist->Display(); -//echo $dlist->queryTime; -$dlist->Close(); +$dlist->Close(); \ No newline at end of file diff --git a/src/admin/css/base.css b/src/admin/css/base.css index 1ddbb0f8..08b419b1 100644 --- a/src/admin/css/base.css +++ b/src/admin/css/base.css @@ -1 +1 @@ -*{font-size:12px;letter-spacing:.4px}body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;line-height:1.5}form,h1,h2,h3,ul,ol,div{margin:0;padding:0}td{line-height:1.5}td,th,div{word-break:break-all;word-wrap:break-word}b,strong{font-weight:400}li,dd{margin:0;padding:0;list-style-type:none}label{display:inline-block;margin:10px 0}input{padding:.25rem .5rem;height:calc(1.5em + .75rem + 2px);line-height:18px;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=radio],input[type=checkbox]{height:auto;box-shadow:none;outline:none}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;line-height:1.5;color:#fff;background:#28a745;border-radius:.2rem;transition:all .6s;border:0}input[type=button]:focus,input[type=submit]:focus,input[type=reset]:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}input:focus,textarea:focus{border-color:#28a745;box-shadow:0 0 2px #28a745;outline:none}textarea{padding:.25rem .5rem;line-height:18px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}select{height:calc(1.5em + .75rem + 2px);padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}h1,h2,h3{font-size:18px;color:#424b51}a:link{color:#424b51;text-decoration:none}a:hover{opacity:.8}a:visited{color:#666}.np{border:0}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f2f2f2;border-bottom:1px solid #ccc;border-radius:.2rem;border:0;cursor:pointer}.coolbg2{height:18px;background:#DFDDD2;border:1px solid #000}.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6}.bline{height:36px;background:#fff;border-bottom:1px solid #eee}#uploadfield{float:left}.bline2{border-bottom:1px solid #eee}.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#E4F7D7;cursor:pointer}.coolbt2{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#F7FCDA}.coolbg3{width:140px;height:20px;border:1px solid #BDC5B4;background:#DFDDD2;text-align:right}.coolbg61{width:380px;height:26px;line-height:26px;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;background:#E7F3B1;text-align:right}.coolbg62{padding:6px;width:380px;height:300px;border:1px solid #BDC5B4;background:#F8FDF0}.coolbg4{width:190px;height:24px;line-height:24px;border-bottom:1px solid #C9CFC1;background:#F9FCDC url(../images/dlgtitle.gif)repeat-x;text-align:right}.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC}.wsselect{height:60px;line-height:24px;background:#FCFEF1;overflow:auto}.dlg{padding:.25rem .5rem;border:2px solid #008E38;background:#F0FAEB;width:360px;line-height:160%}.pubdlg{background:#fff;border:4px solid #008E38;border-radius:.2rem;z-index:8888}.pubdlg .title{height:29px;line-height:29px;border-bottom:1px solid #C9CFC1;background:url(../images/dlgtitle.gif)repeat-x;text-align:left;cursor:move}.pubdlg .titLeft{float:left;padding-left:10px;line-height:29px;font-weight:600;color:#424b51}.pubdlg .titRight{float:right;padding:0}.fullpagediv{position:absolute;top:0;left:0;width:100%;height:120%;background:#cdcdcd;opacity:.5;z-index:1999}.quicksel{margin-left:10px;margin-top:10px;width:680px;height:420px;overflow:auto;z-index:10005}.quickselfoot{padding-top:8px;border-top:1px dashed #C0CC9D}.quickselItem{margin-bottom:8px}.quickselItem .topcat{padding-left:6px;line-height:24px;border-bottom:1px dashed #ccc;background:#FBFEEF;clear:both}.quickselItem .soncat{padding-left:10px}.quickselItem .item{float:left;margin-right:8px}.mysource,.mywriter{padding:.25rem .5rem;width:280px;line-height:160%;border:4px solid #008E38;background:#F0FAEB;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #008E38;background:#F0FAEB}#_mysource{z-index:10003}#_mywriter{z-index:10004}#uploadwait{z-index:19999}.option1{background:#DCECA6}.option2{background:#F7FBD2}.option3{background:#fff}.ininput{width:96%;height:20px;border:1px solid #fff}.nbt{padding:2px;background:#fff url(../images/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.waitpage{position:absolute;top:0;left:0;opacity:.7;background:#ababab url(../../images/loading1.gif)center no-repeat;z-index:10000}.divpre img{max-width:150px;max-height:100px}.divpre{overflow:hidden}.autoinput{padding-left:6px;width:90%}.bodytitle{margin:auto;width:98%;height:28px;border:1px dotted #BFD67C;background:url(../images/wbg.gif)}.bodytitle div{float:left}.bodytitletxt{padding-left:6px;line-height:28px}.tbtitle td{padding:6px}.tblist td{padding:6px;background:#fff}.tblist td.tbsname{padding:6px;background:#F9FFE6}.colordlg{padding:.25rem .5rem;width:100px;line-height:160%;border:2px dashed #008E38;background:#F0FAEB;z-index:10005}option.alltype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(../images/arrr.gif)10px 4px no-repeat}.ilist{border-top:1px dashed #eee;border-bottom:1px dashed #eee;border-left:1px dashed #eee}.ilist td{border-right:1px dashed #eee}#typeid2{padding:0;float:left;height:18px;font-size:12px;background:url(../images/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:85px;height:20px;opacity:0;cursor:pointer}.litpic_span{margin-left:-60px;width:76px;height:22px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate,#uptime{padding-left:30px;background:url(../images/calendar.gif)10px no-repeat}#title{background:url(../images/ruler.gif)repeat-x 0px 10px}.spec{width:60px}.gtab a{display:block;float:left;width:80px;height:26px;line-height:26px;text-align:center}.albCt img{cursor:pointer}.maintable{width:98%!important;border:1px solid #dee2e6}span.page-link{color:#fff;background:#28a745}a.btn{color:white!important}.btn-success{background:#28a745;border-color:#28a745}.table{color:#424b51}.table td,.table th{padding:.6rem;vertical-align:middle}.table th img,.table td img{vertical-align:text-bottom} \ No newline at end of file +*{font-size:12px;letter-spacing:.4px}body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;line-height:1.5}form,h1,h2,h3,ul,ol,div{margin:0;padding:0}td{line-height:1.5}td,th,div{word-break:break-all;word-wrap:break-word}b,strong{font-weight:400}li,dd{margin:0;padding:0;list-style-type:none}label{display:inline-block;margin:10px 0}input{padding:.25rem .5rem;height:calc(1.5em + .75rem + 2px);line-height:18px;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=radio],input[type=checkbox]{height:auto;box-shadow:none;outline:none}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;line-height:1.5;color:#fff;background:#28a745;border-radius:.2rem;transition:all .6s;border:0}input[type=button]:focus,input[type=submit]:focus,input[type=reset]:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}input:focus,textarea:focus{border-color:#28a745;box-shadow:0 0 2px #28a745;outline:none}textarea{padding:.25rem .5rem;line-height:18px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}select{height:calc(1.5em + .75rem + 2px);padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}h1,h2,h3{font-size:18px;color:#424b51}a:link{color:#424b51;text-decoration:none}a:hover{opacity:.8}a:visited{color:#666}.np{border:0}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f2f2f2;border-bottom:1px solid #ccc;border-radius:.2rem;border:0;cursor:pointer}.coolbg2{height:18px;background:#DFDDD2;border:1px solid #000}.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6}.bline{height:36px;background:#fff;border-bottom:1px solid #eee}#uploadfield{float:left}.bline2{border-bottom:1px solid #eee}.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#E4F7D7;cursor:pointer}.coolbt2{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#F7FCDA}.coolbg3{width:140px;height:20px;border:1px solid #BDC5B4;background:#DFDDD2;text-align:right}.coolbg61{width:380px;height:26px;line-height:26px;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;background:#E7F3B1;text-align:right}.coolbg62{padding:6px;width:380px;height:300px;border:1px solid #BDC5B4;background:#F8FDF0}.coolbg4{width:190px;height:24px;line-height:24px;border-bottom:1px solid #C9CFC1;background:#F9FCDC url(../images/dlgtitle.gif)repeat-x;text-align:right}.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC}.wsselect{height:60px;line-height:24px;background:#FCFEF1;overflow:auto}.dlg{padding:.25rem .5rem;border:2px solid #008E38;background:#F0FAEB;width:360px;line-height:160%}.pubdlg{background:#fff;border:4px solid #008E38;border-radius:.2rem;z-index:8888}.pubdlg .title{height:29px;line-height:29px;border-bottom:1px solid #C9CFC1;background:url(../images/dlgtitle.gif)repeat-x;text-align:left;cursor:move}.pubdlg .titLeft{float:left;padding-left:10px;line-height:29px;font-weight:600;color:#424b51}.pubdlg .titRight{float:right;padding:0}.fullpagediv{position:absolute;top:0;left:0;width:100%;height:120%;background:#cdcdcd;opacity:.5;z-index:1999}.quicksel{margin-left:10px;margin-top:10px;width:680px;height:420px;overflow:auto;z-index:10005}.quickselfoot{padding-top:8px;border-top:1px dashed #C0CC9D}.quickselItem{margin-bottom:8px}.quickselItem .topcat{padding-left:6px;line-height:24px;border-bottom:1px dashed #ccc;background:#FBFEEF;clear:both}.quickselItem .soncat{padding-left:10px}.quickselItem .item{float:left;margin-right:8px}.mysource,.mywriter{padding:.25rem .5rem;width:280px;line-height:160%;border:4px solid #008E38;background:#F0FAEB;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #008E38;background:#F0FAEB}#_mysource{z-index:10003}#_mywriter{z-index:10004}#uploadwait{z-index:19999}.option1{background:#DCECA6}.option2{background:#F7FBD2}.option3{background:#fff}.ininput{width:96%;height:20px;border:1px solid #fff}.nbt{padding:2px;background:#fff url(../images/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.waitpage{position:absolute;top:0;left:0;opacity:.7;background:#ababab url(../../images/loading1.gif)center no-repeat;z-index:10000}.divpre img{max-width:150px;max-height:100px}.divpre{overflow:hidden}.autoinput{padding-left:6px;width:90%}.bodytitle{margin:auto;width:98%;height:30px;border:1px dotted #BFD67C;background:url(../images/wbg.gif)}.bodytitle div{float:left}.bodytitletxt{padding-left:6px;line-height:28px}.tbtitle td{padding:6px}.tblist td{padding:6px;background:#fff}.tblist td.tbsname{padding:6px;background:#F9FFE6}.colordlg{padding:.25rem .5rem;width:100px;line-height:160%;border:2px dashed #008E38;background:#F0FAEB;z-index:10005}option.alltype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(../images/arrr.gif)10px 4px no-repeat}.ilist{border-top:1px dashed #eee;border-bottom:1px dashed #eee;border-left:1px dashed #eee}.ilist td{border-right:1px dashed #eee}#typeid2{padding:0;float:left;height:18px;font-size:12px;background:url(../images/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:85px;height:20px;opacity:0;cursor:pointer}.litpic_span{margin-left:-60px;width:76px;height:22px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate,#uptime{padding-left:30px;background:url(../images/calendar.gif)10px no-repeat}#title{background:url(../images/ruler.gif)repeat-x 0px 10px}.spec{width:60px}.gtab a{display:block;float:left;width:80px;height:26px;line-height:26px;text-align:center}.albCt img{cursor:pointer}.maintable{width:98%!important;border:1px solid #dee2e6}span.page-link{color:#fff;background:#28a745}a.btn{color:white!important}.btn-success{background:#28a745;border-color:#28a745}.table{color:#424b51}.table td,.table th{padding:.6rem;vertical-align:middle}.table th img,.table td img{vertical-align:text-bottom} \ No newline at end of file diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php index 1fd9e6ca..35f26c31 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -42,7 +42,7 @@ $actionSearch[0] = array( ), 4 => array( 'title' => '内容回收站', - 'description' => '如果在"系统基本参数"的"核心设置"中开启了"文章回收站(是/否)开启功能",后台删除的文档将会存放在此处', + 'description' => '如果在"系统配置变量"的"核心设置"中开启了"文章回收站(是/否)开启功能",后台删除的文档将会存放在此处', 'purview' => 'a_List,a_AccList,a_MyList', 'linkurl' => 'recycling.php' ) @@ -375,7 +375,7 @@ $actionSearch[10] = array( 'description' => '对网站的一些基本信息和配置进行管理', 'soniterm' => array( 0 => array( - 'title' => '系统基本参数', + 'title' => '系统配置变量', 'description' => '包含站点设置、核心设置 、附件设置、会员设置、互动设置、性能选项、其它选项、模块设置、添加新变量等分类,其中有网站基本信息和网站的基本设置选项', 'purview' => 'sys_Edit', 'linkurl' => 'sys_info.php' diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index aa039283..f83ccab6 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -49,7 +49,7 @@ if ($cuserLogin->getUserType() >= 10) { - + diff --git a/src/admin/inc/inc_menu_map.php b/src/admin/inc/inc_menu_map.php index 28dad79d..40b3636d 100644 --- a/src/admin/inc/inc_menu_map.php +++ b/src/admin/inc/inc_menu_map.php @@ -84,7 +84,7 @@ $menusMain = " - + diff --git a/src/admin/module_main.php b/src/admin/module_main.php index cdc91a53..6ba4c762 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -34,8 +34,7 @@ function ReWriteConfigAuto() global $dsql; $configfile = DEDEDATA.'/config.cache.inc.php'; if (!is_writeable($configfile)) { - echo "配置文件'{$configfile}'不支持写入,无法修改系统配置参数"; - //ClearAllLink(); + echo "配置文件 {$configfile} 不支持写入,无法修改系统配置参数"; exit(); } $fp = fopen($configfile, 'w'); @@ -90,7 +89,6 @@ else if ($action == 'view_developoer') { $offUrl = "

官方网址:{$devInfo['offurl']} (复制在浏览器中打开)

"; } $authAt = date("Y-m-d", $devInfo['auth_at']); - if (!isset($info['dev_id'])) { $devInfo['realname'] = $devInfo['dev_name'] = $info['team']." 未认证"; $authAt = "0000-00-00"; @@ -108,7 +106,7 @@ else if ($action == 'setup') { ShowMsg("获取模块信息错误,模块文件可能被篡改", -1); exit; } - $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); $filelists = $dm->GetFileLists($hash); $filelist = ''; $prvdirs = array(); @@ -186,7 +184,7 @@ else if ($action == 'setup') { - 目录权限检测:
../ 为根目录
./ 表示当前目录 + 目录权限检测:
../ 为根目录
./ 表示当前目录 $prvdir @@ -201,9 +199,9 @@ else if ($action == 'setup') { 对于已存在文件处理方法: - - - + + + "; @@ -281,7 +279,7 @@ function DelModule(); else if ($action == 'del') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); - $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); $dev_id = empty($infos['dev_id'])? "未认证" : "{$infos['dev_id']} 未认证"; $win = new OxWindow(); $win->Init("module_main.php", "js/blank.js", "post"); @@ -316,7 +314,7 @@ else if ($action == 'del') { 浏览 - 删除模块仅删除这个模块的安装包文件,如果您已经安装,请执行卸载程序来删除 + 删除模块仅删除这个模块的安装包文件,如果您已经安装,请执行卸载程序来删除。 "; $win->AddMsgItem("
$msg
"); @@ -338,7 +336,7 @@ else if ($action == 'uninstall') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); if ($infos['url'] == '') $infos['url'] = ' '; - $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); $filelists = $dm->GetFileLists($hash); $filelist = ''; foreach ($filelists as $v) { @@ -381,7 +379,7 @@ else if ($action == 'uninstall') { 浏览 - 模块包含的文件:
(文件路径相对于当前目录)  + 模块包含的文件:
(文件路径相对于当前目录)  @@ -391,8 +389,8 @@ else if ($action == 'uninstall') { 对于模块的文件处理方法: - - + + "; @@ -464,7 +462,7 @@ else if ($action == 'view') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); if ($infos['url'] == '') $infos['url'] = ' '; - $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); $filelists = $dm->GetFileLists($hash); $filelist = ''; $setupinfo = ''; @@ -479,7 +477,7 @@ else if ($action == 'view') { } else { $setupinfo = "未安装 安装"; } - $dev_id = empty($infos['dev_id'])? "安装 未认证" : "{$infos['dev_id']} 未认证"; + $dev_id = empty($infos['dev_id'])? "安装未认证" : "{$infos['dev_id']} 未认证"; $win = new OxWindow(); $win->Init("", "js/blank.js", ""); $wecome_info = "模块管理"; @@ -511,7 +509,7 @@ else if ($action == 'view') { 浏览 - 模块包含的文件:
(文件路径相对于当前目录)  + 模块包含的文件:
(文件路径相对于当前目录)  diff --git a/src/admin/module_upload.php b/src/admin/module_upload.php index 9e5bb392..36a0f230 100644 --- a/src/admin/module_upload.php +++ b/src/admin/module_upload.php @@ -14,16 +14,14 @@ require_once(dirname(__FILE__)."/../include/dedemodule.class.php"); require_once(dirname(__FILE__)."/../include/oxwindow.class.php"); if (empty($action)) $action = ''; $mdir = DEDEDATA.'/module'; - if ($action == 'upload') { if (!is_uploaded_file($upfile)) { - ShowMsg("貌似您什么都没有上传哦", "javascript:;"); + ShowMsg("您什么都没有上传", "javascript:;"); exit(); } else { include_once(dirname(__FILE__)."/../include/zip.class.php"); $tmpfilename = $mdir.'/'.ExecTime().mt_rand(10000, 50000).'.tmp'; - move_uploaded_file($upfile, $tmpfilename) or die("把上传的文件移动到{$tmpfilename}时失败,请检查{$mdir}目录是否有写入权限"); - + move_uploaded_file($upfile, $tmpfilename) or die("把上传的文件移动到 {$tmpfilename} 时失败,请检查 {$mdir} 目录是否有写入权限"); //ZIP格式的文件 if ($filetype == 1) { $z = new zip(); @@ -41,7 +39,7 @@ if ($action == 'upload') { } if ($dedefileindex == -1) { unlink($tmpfilename); - ShowMsg("对不起,您上传的压缩包中不存在dede模块文件

>>返回重新上传>>", "javascript:;"); + ShowMsg("对不起,您上传的压缩包中不存在dede模块文件
重新上传", "javascript:;"); exit(); } $ziptmp = $mdir.'/ziptmp'; @@ -49,24 +47,22 @@ if ($action == 'upload') { unlink($tmpfilename); $tmpfilename = $mdir."/ziptmp/".$dedefile; } - $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($tmpfilename, 'file'); if (empty($infos['hash'])) { unlink($tmpfilename); $dm->Clear(); - ShowMsg("对不起,您上传的文件可能不是织梦模块的标准格式文件

>>返回重新上传>>", "javascript:;"); + ShowMsg("对不起,您上传的文件可能不是织梦模块的标准格式文件
重新上传", "javascript:;"); exit(); } if (preg_match("#[^0-9a-zA-Z]#", $infos['hash'])) { exit("hash check failed!"); } - $okfile = $mdir.'/'.$infos['hash'].'.xml'; if ($dm->HasModule($infos['hash']) && empty($delhas)) { unlink($tmpfilename); $dm->Clear(); - ShowMsg("对不起,您上传的模块已经存在,
如果要覆盖请先删除原来版本或选择强制删除的选项

>>返回重新上传>>", "javascript:;"); + ShowMsg("对不起,您上传的模块已经存在
如果要覆盖请先删除原来版本或选择强制删除的选项
重新上传", "javascript:;"); exit(); } @unlink($okfile); @@ -83,32 +79,24 @@ if ($action == 'upload') { $wecome_info = "模块管理 >> 上传模块"; $win->AddTitle('请选择要上传的文件:'); $win->AddHidden("action", 'upload'); - $msg = " - + $msg = "
- + + + - - + + - + -
文件格式:文件格式: - -
已有模块: - - 已有模块:
请选择文件: -
- "; + "; $win->AddMsgItem("
$msg
"); $winform = $win->GetWindow('ok', ''); $win->Display(); exit(); -} -//ClearAllLink(); +}//ClearAllLink(); \ No newline at end of file diff --git a/src/admin/sys_cache_up.php b/src/admin/sys_cache_up.php index dbbc0a26..a5ea6dcf 100644 --- a/src/admin/sys_cache_up.php +++ b/src/admin/sys_cache_up.php @@ -12,7 +12,6 @@ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_ArcBatch'); if (empty($dopost)) $dopost = ''; if (empty($step)) $step = 1; - if ($dopost == "ok") { if (empty($uparc)) $uparc = 0; if ($step == -1) { @@ -20,7 +19,6 @@ if ($dopost == "ok") { ShowMsg("成功更新所有缓存", "javascript:;"); exit(); } - //更新栏目缓存 else if ($step == 1) { UpDateCatCache(); @@ -28,7 +26,6 @@ if ($dopost == "ok") { ShowMsg("成功更新栏目缓存,及后台栏目选项,准备更新枚举缓存...", "sys_cache_up.php?dopost=ok&step=2&uparc=$uparc"); exit(); } - //更新枚举缓存 else if ($step == 2) { include_once(DEDEINC."/enums.func.php"); @@ -37,7 +34,6 @@ if ($dopost == "ok") { ShowMsg("成功更新枚举缓存,准备更新调用缓存...", "sys_cache_up.php?dopost=ok&step=3&uparc=$uparc"); exit(); } - //清理arclist调用缓存、过期会员访问历史、过期短信 else if ($step == 3) { echo ''; @@ -55,8 +51,8 @@ if ($dopost == "ok") { } //修正错误文档 else if ($step == 9) { - ShowMsg('修正错误文档操作已经取消,请在<系统->系统错误修复[S]>中操作...', 'sys_cache_up.php?dopost=ok&step=-1&uparc=1', 0, 5000); + ShowMsg('修正错误文档操作已经取消,后台系统:系统错误修复中操作...', 'sys_cache_up.php?dopost=ok&step=-1&uparc=1', 0, 5000); exit(); } } -include DedeInclude('templets/sys_cache_up.htm'); +include DedeInclude('templets/sys_cache_up.htm'); \ No newline at end of file diff --git a/src/admin/templets/module_main.htm b/src/admin/templets/module_main.htm index 9ba14426..84978840 100644 --- a/src/admin/templets/module_main.htm +++ b/src/admin/templets/module_main.htm @@ -83,9 +83,8 @@ ?> -
' - > - '>开发者信息 +
'> + 开发者信息