diff --git a/.gitignore b/.gitignore index 33e74142..17e0e3cf 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,7 @@ src/data/backupdata/* src/a/*.html src/data/mkall_cache_*.php src/data/payment/cod.php +src/freelist/ +src/data/rss/* +src/data/rssmap.html +src/data/sitemap.html diff --git a/src/dede/makehtml_freelist.php b/src/dede/makehtml_freelist.php index 1ecdf7c1..6c276c51 100755 --- a/src/dede/makehtml_freelist.php +++ b/src/dede/makehtml_freelist.php @@ -5,6 +5,7 @@ * @version $Id: makehtml_freelist.php 1 9:17 2010年7月19日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ diff --git a/src/dede/makehtml_freelist_action.php b/src/dede/makehtml_freelist_action.php index 4054234c..31ec7a83 100755 --- a/src/dede/makehtml_freelist_action.php +++ b/src/dede/makehtml_freelist_action.php @@ -5,6 +5,7 @@ * @version $Id: makehtml_freelist_action.php 1 9:11 2010年7月19日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -18,7 +19,7 @@ if(!empty($endid) && $endid>=$startid) $ci .= " And aid <= $endid "; } header("Content-Type: text/html; charset={$cfg_soft_lang}"); -$dsql->SetQuery("Select aid From #@__freelist where $ci"); +$dsql->SetQuery("SELECT aid FROM `#@__freelist` WHERE $ci"); $dsql->Execute(); while($row=$dsql->GetArray()) { diff --git a/src/dede/makehtml_homepage.php b/src/dede/makehtml_homepage.php index 3a8a31a7..3e636fb2 100755 --- a/src/dede/makehtml_homepage.php +++ b/src/dede/makehtml_homepage.php @@ -5,6 +5,7 @@ * @version $Id: makehtml_homepage.php 2 9:30 2010-11-11 tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -44,11 +45,13 @@ else if($dopost=="make") $GLOBALS['_arclistEnv'] = 'index'; $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet); $pv->SaveToHtml($homeFile); - echo "成功更新主页HTML：".$homeFile."
浏览...
"; + echo ""; + echo "
成功更新主页HTML：".$homeFile."
浏览...

"; } else { // 动态浏览 if (file_exists($homeFile)) @unlink($homeFile); - echo "采用动态浏览模式：浏览...
"; + echo ""; + echo "
采用动态浏览模式：浏览...

"; } $iquery = "UPDATE `#@__homepageset` SET showmod='$showmod'"; diff --git a/src/dede/makehtml_map.php b/src/dede/makehtml_map.php index e10425ea..b22081d4 100755 --- a/src/dede/makehtml_map.php +++ b/src/dede/makehtml_map.php @@ -5,6 +5,7 @@ * @version $Id: makehtml_map.php 1 11:17 2010年7月19日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -35,5 +36,6 @@ $dtp = new DedeTagParse(); $dtp->LoadTemplet($tmpfile); $dtp->SaveTo($cfg_basedir.$murl); $dtp->Clear(); -echo "成功更新文件: $murl 浏览..."; +echo ""; +echo "
成功更新文件: $murl 浏览...
"; exit(); \ No newline at end of file diff --git a/src/dede/makehtml_rss.php b/src/dede/makehtml_rss.php index cb9d23ab..c28eee85 100755 --- a/src/dede/makehtml_rss.php +++ b/src/dede/makehtml_rss.php @@ -5,6 +5,7 @@ * @version $Id: makehtml_rss.php 1 11:17 2010年7月19日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ diff --git a/src/dede/makehtml_rss_action.php b/src/dede/makehtml_rss_action.php index dc8268f7..ade08073 100755 --- a/src/dede/makehtml_rss_action.php +++ b/src/dede/makehtml_rss_action.php @@ -5,6 +5,7 @@ * @version $Id: makehtml_rss.php 1 11:17 2010年7月19日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -18,7 +19,8 @@ if(empty($maxrecord)) $maxrecord = 50; $row = $dsql->GetOne("SELECT id FROM `#@__arctype` WHERE id>'$tid' AND ispart<>2 ORDER BY id ASC LIMIT 0,1;"); if(!is_array($row)) { - echo "完成所有文件更新！"; + echo ""; + echo "
完成所有文件更新！
"; } else { $rv = new RssView($row['id'],$maxrecord); $rssurl = $rv->MakeRss(0); diff --git a/src/dede/makehtml_spec.php b/src/dede/makehtml_spec.php index eba04c99..448b31e2 100755 --- a/src/dede/makehtml_spec.php +++ b/src/dede/makehtml_spec.php @@ -5,6 +5,7 @@ * @version $Id: makehtml_spec.php 1 11:17 2010年7月19日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -17,7 +18,8 @@ if($dopost=="ok") require_once(DEDEINC."/arc.specview.class.php"); $sp = new SpecView(); $rurl = $sp->MakeHtml(0); - echo "成功生成所有专题HTML列表！预览"; + echo ""; + echo "
成功生成所有专题HTML列表！预览
"; exit(); } include DedeInclude('templets/makehtml_spec.htm'); \ No newline at end of file diff --git a/src/dede/templets/freelist_add.htm b/src/dede/templets/freelist_add.htm index c67813c5..2491a6dd 100755 --- a/src/dede/templets/freelist_add.htm +++ b/src/dede/templets/freelist_add.htm @@ -11,44 +11,6 @@ - @@ -64,11 +26,27 @@
", "
")); + editor.setValue(editor.getValue().toLowerCase()); + } + function ShowHide(objname) { + var obj = document.getElementById(objname); + if (obj.style.display == "block" || obj.style.display == "") + obj.style.display = "none"; + else + obj.style.display = "block"; + } + function SelectTemplets(fname) { + if (document.all) { + var posLeft = window.event.clientY - 200; + var posTop = window.event.clientX - 300; + } + else { + var posLeft = 100; + var posTop = 100; + } + window.open("./dialog/select_templets.php?&activepath=&f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left=" + posLeft + ", top=" + posTop); + } + function CheckSubmit() { + if (document.form1.title.value == "") { + ShowMsg("自由列表标题标题不能为空！"); + document.form1.title.focus(); + return false; + } + return true; + } diff --git a/src/dede/templets/makehtml_freelist.htm b/src/dede/templets/makehtml_freelist.htm index 19cdf586..b7007c72 100755 --- a/src/dede/templets/makehtml_freelist.htm +++ b/src/dede/templets/makehtml_freelist.htm @@ -1,77 +1,92 @@ - + + - -生成HTML - + + 生成HTML + + + + -
-
-
HTML更新
-
-
- - - +
+
+
HTML更新
+
+
- - - - -
更新自由列表HTML： -
+ + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - - - - - - - - - - - - - - - -
+ + + + + +
更新自由列表HTML： +
+
  起始ID： +    + > + （空或0表示从头开始） +
  结束ID： +    + > + （空或0表示直到结束ID） +
  每批生成：    + + 个文件
+ +  
+ + + + + +
进行状态： + + [增大] [缩小] +
+
  起始ID： -    - > - （空或0表示从头开始） -
+
+ +
+ +
  结束ID： -    - > - （空或0表示直到结束ID） -
  每批生成：    - - 个文件
-  
- - - - -
进行状态： - [增大] [缩小] -
- -
-
+ - + + \ No newline at end of file diff --git a/src/include/arc.freelist.class.php b/src/include/arc.freelist.class.php index 841899c5..3055ef93 100755 --- a/src/include/arc.freelist.class.php +++ b/src/include/arc.freelist.class.php @@ -5,6 +5,7 @@ * @version $Id: arc.freelist.class.php 3 15:15 2010年7月7日Z tianya $ * @package DedeCMS.Libraries * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -85,7 +86,7 @@ class FreeList //设置一些全局参数的值 $this->Fields['aid'] = $this->FLInfos['aid']; $this->Fields['title'] = $this->FLInfos['title']; - $this->Fields['position'] = $this->FLInfos['title']; + $this->Fields['position'] = "
  • {$this->FLInfos['title']}
    • "; $this->Fields['keywords'] = $this->FLInfos['keywords']; $this->Fields['description'] = $this->FLInfos['description']; $channelid = $this->ListObj->GetAtt('channel'); @@ -298,7 +299,7 @@ class FreeList //保存文件 $this->dtp->SaveTo($makeFile); - echo "成功创建：".preg_replace("#\/{1,}#", "/", $murl)."
    "; + echo "
    成功创建：".preg_replace("#\/{1,}#", "/", $murl)."

    "; } if($this->FLInfos['nodefault']==0) { @@ -306,7 +307,7 @@ class FreeList $murl .= '/'.$this->FLInfos['defaultpage']; $indexfile = $GLOBALS['cfg_basedir'].$murl; $murl = preg_replace("#\/{1,}#", "/", $murl); - echo "复制：$firstFile 为 ".$this->FLInfos['defaultpage']."
    "; + echo "
    复制：$firstFile 为 ".$this->FLInfos['defaultpage']."

    "; copy($firstFile,$indexfile); } $this->Close(); diff --git a/src/include/arc.specview.class.php b/src/include/arc.specview.class.php index f5f3befd..6fe37ea4 100755 --- a/src/include/arc.specview.class.php +++ b/src/include/arc.specview.class.php @@ -166,8 +166,8 @@ class SpecView */ function Display() { - if($this->TypeLink->TypeInfos['ispart']==1 - ||$this->TypeLink->TypeInfos['ispart']==2) + if(isset($this->TypeLink->TypeInfos) && ($this->TypeLink->TypeInfos['ispart']==1 + ||$this->TypeLink->TypeInfos['ispart']==2)) { $this->DisplayPartTemplets(); } diff --git a/src/include/common.func.php b/src/include/common.func.php index 10c1204d..c5b2fd06 100755 --- a/src/include/common.func.php +++ b/src/include/common.func.php @@ -282,7 +282,7 @@ function ShowMsg($msg, $gourl, $onlymsg=0, $limittime=0) if(empty($GLOBALS['cfg_plus_dir'])) $GLOBALS['cfg_plus_dir'] = '..'; $htmlhead = "\r\n\r\nDedeCMS提示信息\r\n\r\n"; - $htmlhead .= ""; + $htmlhead .= ""; $htmlhead .= "\r\n".(isset($GLOBALS['ucsynlogin']) ? $GLOBALS['ucsynlogin'] : '')."\r\n
    \r\n\r\n
    \r\n\r\n\r\n"; diff --git a/src/include/dedetag.class.php b/src/include/dedetag.class.php index 5f37827b..e13f9f09 100755 --- a/src/include/dedetag.class.php +++ b/src/include/dedetag.class.php @@ -5,6 +5,7 @@ * @version $Id: dedetag.class.php 1 10:33 2010年7月6日Z tianya $ * @package DedeCMS.Libraries * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ diff --git a/src/static/css/dede.css b/src/static/css/dede.css index 5ff893f0..be341ff6 100644 --- a/src/static/css/dede.css +++ b/src/static/css/dede.css @@ -624,6 +624,11 @@ nav.location .dede li.active .nav-link { height: 160px; } +.list-image img { + width: 130px; + max-width: 130px!important; +} + @media only screen and (max-width: 1199px) { .ddcard > .card-header .caption span { font-size: 14px; diff --git a/src/templets/default/article_spec.htm b/src/templets/default/article_spec.htm index e9c90bbe..8539dcad 100755 --- a/src/templets/default/article_spec.htm +++ b/src/templets/default/article_spec.htm @@ -45,7 +45,6 @@ 时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/} 来源：{dede:field.source/} 作者：{dede:field.writer/} - 点击：...次
    diff --git a/src/templets/default/list_article.htm b/src/templets/default/list_article.htm index c13250e4..41a539c1 100755 --- a/src/templets/default/list_article.htm +++ b/src/templets/default/list_article.htm @@ -42,7 +42,7 @@
    -

    [field:code/] [field:title/]

    +

    [field:title/]
    diff --git a/src/templets/default/list_free.htm b/src/templets/default/list_free.htm index 7dae24b1..8d64d84c 100755 --- a/src/templets/default/list_free.htm +++ b/src/templets/default/list_free.htm @@ -1,63 +1,68 @@ - - + + - -{dede:field.title/}_{dede:global.cfg_webname/} - - - + + + + + + + + {dede:field.title/}_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/} + + - -{dede:include filename="head.htm"/} - - -
    -
    -
    - 当前位置: {dede:field name='position'/} -
    -
    -
      - {dede:freelist/} -
    -
    -
    -
      - {dede:pagelist listitem="info,index,end,pre,next,pageno" listsize="5"/} -
    -
    -
    - -
    -
    -
    -
    推荐内容
    -
    -
      - {dede:arclist flag='c' titlelen=42 row=6} -
    • [field:title/] -

      [field:description function='cn_substr(@me,80)'/]...

      -
      • {/dede:arclist} -
    -
    -
    -
    -
    -
    -
    热点内容
    -
    -
      - {dede:arclist row=10 orderby=click} -
    • [field:title/]
      • - {/dede:arclist} -
    -
    -
    -
    -
    -
    -{dede:include filename="footer.htm"/} - + + {dede:include filename="top.htm"/} + + {dede:include filename="header.htm"/} + + {dede:include filename="navbar.htm"/} + +
    +
    + +
    + +
    + +
    +
    +
    +
      + {dede:freelist/} +
    + + +
    + + + + + +
    +
    + + + {dede:include filename="footer.htm"/} + diff --git a/src/templets/default/list_spec.htm b/src/templets/default/list_spec.htm index 6b9e58b7..f9a02ccc 100755 --- a/src/templets/default/list_spec.htm +++ b/src/templets/default/list_spec.htm @@ -1,76 +1,90 @@ - - + + - -专题_{dede:global.cfg_webname/} - - - + + + + + + + + 专题_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/} + + - -{dede:include filename="head.htm"/} - -
    -
    -
    - 当前位置: 专题列表 -
    -
    -
      -{dede:list pagesize='10'} -
    • - [field:array runphp='yes']@me = (empty(@me['litpic']) ? "" : ""); [/field:array] - [field:title/] - - 日期：[field:pubdate function="GetDateTimeMK(@me)"/] - 点击：[field:click/] - -

      - [field:description/]... -

      -
      • -{/dede:list} -
    -
    -
    -
      - {dede:pagelist listitem="info,index,end,pre,next,pageno" listsize="5"/} -
    -
    -
    - -
    -
    -
    -
    推荐专题
    -
    -
      - {dede:arclist flag='c' channelid='-1' titlelen=42 row=6} -
    • [field:title/] -

      [field:description function='cn_substr(@me,80)'/]...

      -
      • {/dede:arclist} -
    -
    -
    -
    -
    -
    -
    热点内容
    -
    -
      - {dede:arclist row=10 orderby=click} -
    • [field:title/]
      • - {/dede:arclist} -
    -
    -
    -
    + + {dede:include filename="top.htm"/} + + {dede:include filename="header.htm"/} -
    -
    + {dede:include filename="navbar.htm"/} - +
    +
    + +
    + +
    +
    +
    +
    + + + + +
    + + + + + +
    +
    + + + {dede:include filename="footer.htm"/} - + + \ No newline at end of file diff --git a/src/templets/system/spec_arclist.htm b/src/templets/system/spec_arclist.htm index dbc781e3..63fe8978 100755 --- a/src/templets/system/spec_arclist.htm +++ b/src/templets/system/spec_arclist.htm @@ -1 +1 @@ -
  • [[field:typename/]] [field:title /]
    • +
  • [field:typename/] [field:title /]