diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index 7d38883c..628da6ec 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -3969,7 +3969,7 @@ INSERT INTO `#@__sysconfig` VALUES('1','cfg_basehost','站点根网址','1','str ('25','cfg_multi_site','(是/否)支持多站点，开启此项后附件、栏目连接、arclist内容启用绝对网址','2','bool','N'), ('58','cfg_rm_remote','远程图片本地化','7','bool','Y'), ('27','cfg_dede_log','(是/否)开启管理日志','2','bool','N'), -('28','cfg_powerby','网站版权信息','1','bstring','Copyright © 2002-2020 DedeCMS. 织梦科技 版权所有'), +('28','cfg_powerby','网站版权信息','1','bstring','Copyright © 2020 DedeBIZ 版权所有'), ('722','cfg_jump_once','跳转网址是否直接跳转？（否则显示中转页）','7','bool','Y'), ('723','cfg_task_pwd','系统计划任务客户端许可密码
(需要客户端，通常不会太重要)','7','string',''), ('29','cfg_arcsptitle','(是/否)开启分页标题，开启会影响HTML生成速度','6','bool','N'), diff --git a/src/member/content_list.php b/src/member/content_list.php index 54c1dd2b..973ad182 100755 --- a/src/member/content_list.php +++ b/src/member/content_list.php @@ -1,4 +1,5 @@ M_ID; $tl = new TypeLink($cid); -$cInfos = $tl->dsql->GetOne("Select arcsta,issend,issystem,usertype From `#@__channeltype` where id='$channelid'; "); -if(!is_array($cInfos)) -{ +$cInfos = $tl->dsql->GetOne("SELECT arcsta,issend,issystem,usertype FROM `#@__channeltype` WHERE id='$channelid'; "); +if (!is_array($cInfos)) { ShowMsg('模型不存在', '-1'); exit(); } $arcsta = $cInfos['arcsta']; $dtime = time(); -$maxtime = $cfg_mb_editday * 24 *3600; +$maxtime = $cfg_mb_editday * 24 * 3600; //禁止访问无权限的模型 -if($cInfos['usertype'] !='' && $cInfos['usertype']!=$cfg_ml->M_MbType) -{ +if ($cInfos['usertype'] != '' && $cInfos['usertype'] != $cfg_ml->M_MbType) { ShowMsg('你无权限访问该部分', '-1'); exit(); } -if($cid==0) -{ +if ($cid == 0) { $row = $tl->dsql->GetOne("Select typename From #@__channeltype where id='$channelid'"); - if(is_array($row)) - { + if (is_array($row)) { $positionname = $row['typename']; } -} -else -{ - $positionname = str_replace($cfg_list_symbol,"",$tl->GetPositionName())." "; +} else { + $positionname = str_replace($cfg_list_symbol, "", $tl->GetPositionName()) . " "; } $whereSql = " where arc.channel = '$channelid' And arc.mid='$mid' "; -if($keyword!='') -{ - $keyword = cn_substr(trim(preg_replace("#[><\|\"\r\n\t%\*\.\?\(\)\$ ;,'%-]#", "", stripslashes($keyword))),30); +if ($keyword != '') { + $keyword = cn_substr(trim(preg_replace("#[><\|\"\r\n\t%\*\.\?\(\)\$ ;,'%-]#", "", stripslashes($keyword))), 30); $keyword = addslashes($keyword); $whereSql .= " And (arc.title like '%$keyword%') "; } -if($cid!=0) $whereSql .= " And arc.typeid in (".GetSonIds($cid).")"; +if ($cid != 0) $whereSql .= " And arc.typeid in (" . GetSonIds($cid) . ")"; //增加分类查询 -if($arcrank == '1'){ +if ($arcrank == '1') { $whereSql .= " And arc.arcrank >= 0"; -}else if($arcrank == '-1'){ +} else if ($arcrank == '-1') { $whereSql .= " And arc.arcrank = -1"; -}else if($arcrank == '-2'){ +} else if ($arcrank == '-2') { $whereSql .= " And arc.arcrank = -2"; } $classlist = ''; $dsql->SetQuery("SELECT * FROM `#@__mtypes` WHERE `mid` = '$cfg_ml->M_ID';"); $dsql->Execute(); -while ($row = $dsql->GetArray()) -{ - $classlist .= "\r\n"; +while ($row = $dsql->GetArray()) { + $classlist .= "\r\n"; } -if($mtypesid != 0 ) -{ +if ($mtypesid != 0) { $whereSql .= " And arc.mtype = '$mtypesid'"; } -$query = "select arc.id,arc.typeid,arc.senddate,arc.flag,arc.ismake,arc.channel,arc.arcrank, +$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,tp.typename,ch.typename as channelname from `#@__archives` arc left join `#@__arctype` tp on tp.id=arc.typeid @@ -91,10 +83,10 @@ $query = "select arc.id,arc.typeid,arc.senddate,arc.flag,arc.ismake,arc.channel, $whereSql order by arc.senddate desc "; $dlist = new DataListCP(); $dlist->pageSize = 20; -$dlist->SetParameter("dopost","listArchives"); -$dlist->SetParameter("keyword",$keyword); -$dlist->SetParameter("cid",$cid); -$dlist->SetParameter("channelid",$channelid); -$dlist->SetTemplate(DEDEMEMBER."/templets/content_list.htm"); +$dlist->SetParameter("dopost", "listArchives"); +$dlist->SetParameter("keyword", $keyword); +$dlist->SetParameter("cid", $cid); +$dlist->SetParameter("channelid", $channelid); +$dlist->SetTemplate(DEDEMEMBER . "/templets/content_list.htm"); $dlist->SetSource($query); -$dlist->Display(); \ No newline at end of file +$dlist->Display(); diff --git a/src/member/content_sg_list.php b/src/member/content_sg_list.php index 0421c13d..2d654346 100755 --- a/src/member/content_sg_list.php +++ b/src/member/content_sg_list.php @@ -58,8 +58,15 @@ if($cid!=0) { $whereSql .= " AND arc.typeid in (".GetSonIds($cid).")"; } +if ($arcrank == '1') { + $whereSql .= " And arc.arcrank >= 0"; +} else if ($arcrank == '-1') { + $whereSql .= " And arc.arcrank = -1"; +} else if ($arcrank == '-2') { + $whereSql .= " And arc.arcrank = -2"; +} -$query = "SELECT arc.aid,arc.aid as id,arc.typeid,arc.senddate,arc.channel,arc.click,arc.title,arc.mid,tp.typename +$query = "SELECT arc.aid,arc.aid as id,arc.typeid,arc.senddate,arc.channel,arc.click,arc.title,arc.mid,tp.typename,arc.arcrank FROM `{$cInfos['addtable']}` arc LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid $whereSql diff --git a/src/member/index.php b/src/member/index.php index a0313d2b..f809f152 100755 --- a/src/member/index.php +++ b/src/member/index.php @@ -13,14 +13,7 @@ if(empty($action)) $action = ''; if(empty($aid)) $aid = ''; $menutype = 'mydede'; -if ( preg_match("#PHP (.*) Development Server#",$_SERVER['SERVER_SOFTWARE']) ) -{ - if ( $_SERVER['REQUEST_URI'] == dirname($_SERVER['SCRIPT_NAME']) ) - { - header('HTTP/1.1 301 Moved Permanently'); - header('Location:'.$_SERVER['REQUEST_URI'].'/'); - } -} + //会员后台 if($uid=='') { @@ -46,9 +39,9 @@ if($uid=='') /* 最新文档8条 */ $archives = array(); $sql = "SELECT arc.*, category.namerule, category.typedir, category.moresite, category.siteurl, category.sitepath, mem.userid - FROM #@__archives arc - LEFT JOIN #@__arctype category ON category.id=arc.typeid - LEFT JOIN #@__member mem ON mem.mid=arc.mid + FROM `#@__archives` arc + LEFT JOIN `#@__arctype` category ON category.id=arc.typeid + LEFT JOIN `#@__member` mem ON mem.mid=arc.mid WHERE arc.arcrank > -1 ORDER BY arc.sortrank DESC LIMIT 8"; $dsql->SetQuery($sql); @@ -85,7 +78,7 @@ if($uid=='') } /** 有没新短信 **/ - $pms = $dsql->GetOne("SELECT COUNT(*) AS nums FROM #@__member_pms WHERE toid='{$cfg_ml->M_ID}' AND `hasview`=0 AND folder = 'inbox'"); + $pms = $dsql->GetOne("SELECT COUNT(*) AS nums FROM `#@__member_pms` WHERE toid='{$cfg_ml->M_ID}' AND `hasview`=0 AND folder = 'inbox'"); $dpl = new DedeTemplate(); $tpl = dirname(__FILE__)."/templets/index.htm"; diff --git a/src/member/templets/content_list.htm b/src/member/templets/content_list.htm index f65f6b79..818eaeff 100755 --- a/src/member/templets/content_list.htm +++ b/src/member/templets/content_list.htm @@ -10,6 +10,17 @@ 文档管理 - 会员中心 - <?php echo $cfg_webname; ?> + diff --git a/src/member/templets/content_sg_list.htm b/src/member/templets/content_sg_list.htm index 6e92f2bf..a4494cc5 100755 --- a/src/member/templets/content_sg_list.htm +++ b/src/member/templets/content_sg_list.htm @@ -1,72 +1,104 @@ - - + + + - -文档管理 - 会员中心 - <?php echo $cfg_webname; ?> - - - - - + + + + + + + + 文档管理 - 会员中心 - <?php echo $cfg_webname; ?> + + -
- -
- -
-
-
    -
    • -
+ + +
+ + +
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + {dede:datalist} + + + + + + + + + {/dede:datalist} + +
文章标题类目 状态 点击 发布时间 操作
' target='_blank'> =0) echo "已审核"; + else if($fields['arcrank']==-2) echo "被退回"; + else echo "未审核"; + ?> + 修改 | 删除 | 预览 +
+
+ + +
+
+
-
- -

已发布(曾经发布的所有)

- - - - - - - - - - - - {dede:datalist} - - - - - - - - {/dede:datalist} - - - - - - -
文章标题类目 点击 发布时间 操作
' target='_blank'> - 修改 | 删除 | 预览 -
{dede:pagelist listsize=5/}
-
-
-
- -
+ + - + + \ No newline at end of file diff --git a/src/member/templets/menu.htm b/src/member/templets/menu.htm index 1ff5fb69..c805cf31 100644 --- a/src/member/templets/menu.htm +++ b/src/member/templets/menu.htm @@ -1,3 +1,11 @@ +Execute('addmod', "SELECT id,nid,typename,useraddcon,usermancon,issend,issystem,usertype,isshow FROM `#@__channeltype` "); +$channels = array(); +while ($channel = $dsql->GetArray('addmod')) { + $channels[$channel['id']] = $channel; +} +?>
  • @@ -5,15 +13,13 @@