diff --git a/docs/changelog.md b/docs/changelog.md index 57ab3caa..723e26d9 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,7 +1,7 @@ # 更新记录 通过访问 https://www.dedebiz.com/git 获取完整更新记录 -## v6.0.0 +## v6.0.4 - 调整DedeCMS目录结构，将原有include中外部访问的内容迁移出去； - 修正已知存在的安全问题； - 升级内置编辑器ckeditor4为最新版本； diff --git a/src/admin/catalog_add.php b/src/admin/catalog_add.php index a0134164..ed7f0918 100644 --- a/src/admin/catalog_add.php +++ b/src/admin/catalog_add.php @@ -4,23 +4,20 @@ * * @version $Id: catalog_add.php 1 14:31 2010年7月12日Z tianya $ * @package DedeBIZ.Administrator - * @copyright Copyright (c) 2022, DedeBIZ.COM + * @copyright Copyright (c) 2021, DedeBIZ.COM * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); require_once(DEDEINC."/typelink.class.php"); - if (empty($listtype)) $listtype = ''; if (empty($dopost)) $dopost = ''; if (empty($upinyin)) $upinyin = 0; if (empty($channelid)) $channelid = 1; if (isset($channeltype)) $channelid = $channeltype; - $id = empty($id) ? 0 : intval($id); $reid = empty($reid) ? 0 : intval($reid); $nid = 'article'; - if ($id == 0 && $reid == 0) { CheckPurview('t_New'); } else { @@ -28,9 +25,7 @@ if ($id == 0 && $reid == 0) { CheckPurview('t_AccNew'); CheckCatalog($checkID, '您无权在本栏目下创建子类'); } - if (empty($myrow)) $myrow = array(); - $dsql->SetQuery("SELECT id,typename,nid FROM `#@__channeltype` WHERE id<>-1 AND isshow=1 ORDER BY id"); $dsql->Execute(); while ($row = $dsql->GetObject()) { @@ -48,17 +43,15 @@ if ($dopost == 'quick') { } /*--------------------- function action_savequick(){ } ----------------------*/ else if ($dopost == 'savequick') { +---------------------*/ +else if ($dopost == 'savequick') { if (!isset($savetype)) $savetype = ''; $isdefault = isset($isdefault) ? $isdefault : 0; $tempindex = "{style}/index_{$nid}.htm"; $templist = "{style}/list_{$nid}.htm"; $temparticle = "{style}/article_{$nid}.htm"; - $queryTemplate = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,typedir,isdefault,defaultname,issend,channeltype, - tempindex,templist,temparticle,modname,namerule,namerule2,ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`cross`,`crossid`,`content`,`smalltypes`) - VALUES('~reid~','~topid~','~rank~','~typename~','~typedir~','$isdefault','$defaultname','$issend','$channeltype', - '$tempindex','$templist','$temparticle','default','$namerule','$namerule2','0','0','','','~typename~','0','','','0','0','0','','')"; - + $queryTemplate = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,namegk,enname,ennamegk,litpic,litimg,typedir,isdefault,defaultname,issend,channeltype,tempindex,templist,temparticle,modname,namerule,namerule2,ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`cross`,`crossid`,`content`,`smalltypes`) + VALUES('~reid~','~topid~','~rank~','~typename~','~namegk~','~enname~','~ennamegk~','~litpic~','~litimg~','~typedir~','$isdefault','$defaultname','$issend','$channeltype','$tempindex','$templist','$temparticle','default','$namerule','$namerule2','0','0','','','~typename~','0','','','0','0','0','','')"; if (empty($savetype)) { foreach ($_POST as $k => $v) { if (preg_match("#^posttype#", $k)) { @@ -99,8 +92,6 @@ function action_savequick(){ } } } } else { - - $row = $dsql->GetOne("SELECT `typedir` FROM `#@__arctype` WHERE `id`={$reid}"); foreach ($_POST as $k => $v) { if (preg_match("#^posttype#", $k)) { @@ -122,7 +113,6 @@ function action_savequick(){ } $toptypedir = '/'.$toptypedir; break; } - if (empty($toptypename)) { continue; } @@ -140,18 +130,16 @@ function action_savequick(){ } } /*--------------------- function action_save(){ } ----------------------*/ else if ($dopost == 'save') { +---------------------*/ +else if ($dopost == 'save') { $smalltypes = ''; if (empty($smalltype)) $smalltype = ''; if (is_array($smalltype)) $smalltypes = join(',', $smalltype); - if (!isset($sitepath)) $sitepath = ''; if ($topid == 0 && $reid > 0) $topid = $reid; if ($ispart != 0) $cross = 0; - $description = Html2Text($description, 1); $keywords = Html2Text($keywords, 1); - if ($ispart != 2) { //栏目的参照目录 if ($referpath == 'cmspath') $nextdir = '{cmspath}'; @@ -163,11 +151,9 @@ function action_save(){ } $typedir = $nextdir.'/'.$typedir; $typedir = preg_replace("#\/{1,}#", "/", $typedir); } - //开启多站点时的设置(仅针对顶级栏目) if ($reid == 0 && $moresite == 1) { $sitepath = $typedir; - //检测二级网址 if ($siteurl != '') { $siteurl = preg_replace("#\/$#", "", $siteurl); @@ -181,7 +167,6 @@ function action_save(){ } } } } - //创建目录 if ($ispart != 2) { $true_typedir = str_replace("{cmspath}", $cfg_cmspath, $typedir); @@ -191,14 +176,8 @@ function action_save(){ } exit(); } } - - $in_query = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,typedir,isdefault,defaultname,issend,channeltype, - tempindex,templist,temparticle,modname,namerule,namerule2, - ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`cross`,`crossid`,`content`,`smalltypes`) - VALUES('$reid','$topid','$sortrank','$typename','$typedir','$isdefault','$defaultname','$issend','$channeltype', - '$tempindex','$templist','$temparticle','default','$namerule','$namerule2', - '$ispart','$corank','$description','$keywords','$seotitle','$moresite','$siteurl','$sitepath','$ishidden','$cross','$crossid','$content','$smalltypes')"; - + $in_query = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,namegk,enname,ennamegk,litpic,litimg,typedir,isdefault,defaultname,issend,channeltype,tempindex,templist,temparticle,modname,namerule,namerule2,ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`cross`,`crossid`,`content`,`smalltypes`) + VALUES('$reid','$topid','$sortrank','$typename','$namegk','$enname','$ennamegk','$litpic','$litimg','$typedir','$isdefault','$defaultname','$issend','$channeltype','$tempindex','$templist','$temparticle','default','$namerule','$namerule2','$ispart','$corank','$description','$keywords','$seotitle','$moresite','$siteurl','$sitepath','$ishidden','$cross','$crossid','$content','$smalltypes')"; if (!$dsql->ExecuteNoneQuery($in_query)) { ShowMsg("保存目录数据时失败，请检查您的输入资料是否存在问题", "-1"); exit(); @@ -209,8 +188,7 @@ function action_save(){ } } ShowMsg("成功创建一个分类", "catalog_main.php"); exit(); -} //End dopost==save - +}//End dopost==save //获取从父目录继承的默认参数 if ($dopost == '') { $channelid = 1; @@ -228,9 +206,7 @@ if ($dopost == '') { $topid = $myrow['topid']; $typedir = $myrow['typedir']; } - //父栏目是否为二级站点 $moresite = empty($myrow['moresite']) ? 0 : $myrow['moresite']; } - -include DedeInclude('templets/catalog_add.htm'); +include DedeInclude('templets/catalog_add.htm'); \ No newline at end of file diff --git a/src/admin/catalog_edit.php b/src/admin/catalog_edit.php index 1fb393db..035df3ea 100644 --- a/src/admin/catalog_edit.php +++ b/src/admin/catalog_edit.php @@ -4,7 +4,7 @@ * * @version $Id: catalog_edit.php 1 14:31 2010年7月12日Z tianya $ * @package DedeBIZ.Administrator - * @copyright Copyright (c) 2022, DedeBIZ.COM + * @copyright Copyright (c) 2021, DedeBIZ.COM * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ @@ -33,6 +33,11 @@ if ($dopost == "save") { issend='$issend', sortrank='$sortrank', typename='$typename', + namegk='$namegk', + enname='$enname', + ennamegk='$ennamegk', + litpic='$litpic', + litimg='$litimg', typedir='$typedir', isdefault='$isdefault', defaultname='$defaultname', @@ -72,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(); @@ -91,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).")"; @@ -160,76 +165,80 @@ if ($dopost == 'time') { - - - - + + + + + + - - + + - - + + - - + + （仅限制栏目里的文档浏览权限） - - + + - - + - - + + - - + +
是否支持投稿： - - + + 当前是快捷编辑模式，如果您要修改更详细的参数，请使用高级模式>>
内容模型： + 是否支持投稿： +   + +
内容模型： $arr) { if ($k == $channelid) echo "{$arr['typename']} | {$arr['nid']}"; } ?> - 更多模型 + [修改]
栏目名称：栏目名称：
排列顺序： （由低 -> 高）排列顺序： （由低 -> 高）
浏览权限： - 浏览权限：（仅限制栏目里的文档浏览权限） -
文件保存目录：文件保存目录：
栏目列表选项： - - - + 栏目列表选项： + + +
默认页的名称：默认页的名称：
栏目属性： -
-
- - 		栏目属性： +
+
+
- - + +     +
diff --git a/src/admin/css/base.css b/src/admin/css/base.css index 2ae28177..1ddbb0f8 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{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: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 diff --git a/src/admin/inc/grouplist.txt b/src/admin/inc/grouplist.txt index 7c3ae10a..66e6b233 100644 --- a/src/admin/inc/grouplist.txt +++ b/src/admin/inc/grouplist.txt @@ -63,7 +63,7 @@ >sys_User>系统用户管理 >sys_Group>系统组管理 ->sys_MdPwd>更改个人密码 +>sys_MdPwd>修改个人密码 >sys_DelUpload>删除附件 >sys_Edit>修改系统参数 >sys_Log>管理日志 @@ -86,5 +86,5 @@ >member_Type>会员类型管理 >member_List>列出会员 ->member_Edit>更改会员 +>member_Edit>修改会员 >member_Del>删除会员 diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index eb8cfca2..3fa2c290 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -65,8 +65,8 @@ table{border-collapse:separate} - - + +
 图集列表 >> 发布新图集栏目管理  图集列表 >> 发布图集栏目管理
@@ -74,8 +74,8 @@ table{border-collapse:separate} @@ -86,7 +86,7 @@ table{border-collapse:separate} @@ -191,26 +181,25 @@ table{border-collapse:separate} @@ -221,16 +210,13 @@ table{border-collapse:separate}
- - + +
 常规内容 高级参数 常规内容高级参数
- +
常规内容 常规内容 高级参数
@@ -112,16 +112,17 @@ table{border-collapse:separate} - @@ -160,29 +161,18 @@ table{border-collapse:separate} - +
 自定义属性：SetQuery("Select * From `#@__arcatt` order by sortid asc"); - $dsql->Execute(); - while($trow = $dsql->GetObject()) - { - if($trow->att=='j') - echo " "; - else - echo " "; - } + + SetQuery("Select * From `#@__arcatt` order by sortid asc"); + $dsql->Execute(); + while($trow = $dsql->GetObject()) + { + if($trow->att=='j') + echo " "; + else + echo " "; + } ?>
-
+ - - - - - 选择图片 - - - -
- + + 上传图片 + + +
- -
- + + if($cfg_need_typeid2=='Y') + { + echo "选择副栏目"; + } + ?> +
 图集主栏目： 图集主栏目： getUserChannel(),$channelid); - echo ""; - ?> - 快捷选择 -   + $typeOptions = GetOptionList($cid,$cuserLogin->getUserChannel(),$channelid); + echo ""; + ?> + + 快捷选择 选择副栏目"; - } - ?> -
 图集副栏目： - - 选择副栏目 + + 选择副栏目
- @@ -238,21 +224,18 @@ table{border-collapse:separate}  图集选项： - + @@ -264,17 +247,15 @@ table{border-collapse:separate}
 表现方式： -
- + - +
 多列式参数：行 - - 　列 - - 　缩略图宽度限制： - - 像素 + 行  + 列  + 缩略图宽度限制： 像素 +
 (系统仅是每页输出"行x列"张图片，实现需自行控制样式表)（系统仅是每页输出"行x列"张图片，实现需自行控制样式表）
@@ -284,11 +265,7 @@ table{border-collapse:separate} - +
 每页图片数： - - 单页多图显示需要设置此参数，这种模式下系统不会为每张图单独生成缩略图。 -  单页多图显示需要设置此参数，这种模式下系统不会为每张图单独生成缩略图。
@@ -302,8 +279,7 @@ table{border-collapse:separate} - @@ -329,15 +304,11 @@ table{border-collapse:separate} -
 网上复制： 复制的源网址： - - (防盗链网站需填写您复制图片的其中一个网页网址)
+ 		复制的源网址：（防盗链网站需填写您复制图片的其中一个网页网址）
把图片从别的网页复制，在这里用Ctrl+V粘贴，提交后程序可直接获取这个区域的所有图片 -
-
粘贴到这里...
+
+
粘贴到这里...
@@ -348,13 +319,7 @@ table{border-collapse:separate} - +
 手工上传： - - - 选择本地图片（支持多选） - - - 选择本地图片（支持多选）
@@ -382,7 +347,7 @@ table{border-collapse:separate} - + @@ -392,7 +357,7 @@ table{border-collapse:separate} - + @@ -439,7 +400,8 @@ table{border-collapse:separate} 标题颜色： - + + @@ -450,16 +412,17 @@ table{border-collapse:separate}  阅读权限： + ?> + + 发布选项：