diff --git a/src/admin/article_keywords_select.php b/src/admin/article_keywords_select.php index 05f47a1d..8e58edab 100644 --- a/src/admin/article_keywords_select.php +++ b/src/admin/article_keywords_select.php @@ -23,7 +23,7 @@ $dlist->Display(); function GetSta($sta) { if ($sta == 1) return "正常"; - else return "禁用"; + else return "禁用"; } function GetMan($sta) { diff --git a/src/admin/baidunews.php b/src/admin/baidunews.php deleted file mode 100644 index c2bf19de..00000000 --- a/src/admin/baidunews.php +++ /dev/null @@ -1,76 +0,0 @@ -\n"; - $baidunews .= "\n"; - $baidunews .= "$cfg_webname \n"; - $baidunews .= "$cfg_adminemail \n"; - $baidunews .= "$cfg_updateperi \n"; - $limit = $cfg_baidunews_limit; - if ($limit > 100 || $limit < 1) { - $limit = 100; - } - $query = "SELECT maintable.*, addtable.body, arctype.typename - FROM `#@__archives` maintable - LEFT JOIN `#@__addonarticle` addtable ON addtable.aid=maintable.id - LEFT JOIN `#@__arctype` arctype ON arctype.ID=maintable.typeid - WHERE maintable.channel=1 and maintable.arcrank!=-1 ORDER BY maintable.pubdate DESC LIMIT $limit - "; - $dsql->SetQuery($query); - $dsql->Execute(); - $proto = IsSSL()? "https://" : "http://"; - while ($row = $dsql->GetArray()) { - $title = dede_htmlspecialchars($row['title']); - $row1 = GetOneArchive($row['id']); - if ((strpos($row1['arcurl'], 'http://') === false) || (strpos($row1['arcurl'], 'https://') === false)) { - $link = ($cfg_basehost == '' ? $proto.$_SERVER["HTTP_HOST"].$cfg_cmspath : $cfg_basehost).$row1['arcurl']; - } else { - $link = $row1['arcurl']; - } - $link = dede_htmlspecialchars($link); - $description = dede_htmlspecialchars(strip_tags($row['description'])); - $text = dede_htmlspecialchars(strip_tags($row['body'])); - $image = $row['litpic'] == '' ? '' : $row['litpic']; - if ($image != '' && (strpos($image, 'http://') === false) || (strpos($image, 'https://') === false)) { - $image = ($cfg_basehost == '' ? $proto.$_SERVER["HTTP_HOST"].$cfg_cmspath : $cfg_basehost).$image; - } - //$headlineimg = ''; - $keywords = dede_htmlspecialchars($row['keywords']); - $category = dede_htmlspecialchars($row['typename']); - $author = dede_htmlspecialchars($row['writer']); - $source = dede_htmlspecialchars($row['source']); - $pubdate = dede_htmlspecialchars(gmdate('Y-m-d H:i', $row['pubdate'] + $cfg_cli_time * 3600)); - $baidunews .= "\n"; - $baidunews .= "$title \n"; - $baidunews .= "$link \n"; - $baidunews .= "$description \n"; - $baidunews .= "$text \n"; - $baidunews .= "$image \n"; - //$baidunews .= "\n"; - $baidunews .= "$keywords \n"; - $baidunews .= "$category \n"; - $baidunews .= "$author \n"; - $baidunews .= "$source \n"; - $baidunews .= "$pubdate \n"; - $baidunews .= "\n"; - } - $baidunews .= "\n"; - $fname = str_replace("//","/",DEDEROOT.$filename) ; - $fp = fopen($fname, 'w'); - fwrite($fp, $baidunews); - fclose($fp); - showmsg("{$filename}生成成功", 'javascript:;'); -} \ No newline at end of file diff --git a/src/admin/catalog_add.php b/src/admin/catalog_add.php index 5e4a419a..04d806c5 100644 --- a/src/admin/catalog_add.php +++ b/src/admin/catalog_add.php @@ -50,7 +50,7 @@ else if ($dopost == 'savequick') { $tempindex = "{style}/index_{$nid}.htm"; $templist = "{style}/list_{$nid}.htm"; $temparticle = "{style}/article_{$nid}.htm"; - $queryTemplate = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,namegk,enname,ennamegk,bigpic,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`) + $queryTemplate = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,cnoverview,enname,enoverview,bigpic,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~','','','','','','~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) { @@ -176,8 +176,8 @@ else if ($dopost == 'save') { exit(); } } - $in_query = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,namegk,enname,ennamegk,bigpic,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','$bigpic','$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')"; + $in_query = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,cnoverview,enname,enoverview,bigpic,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','$cnoverview','$enname','$enoverview','$bigpic','$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(); diff --git a/src/admin/catalog_edit.php b/src/admin/catalog_edit.php index e87f10ae..7f005ba7 100644 --- a/src/admin/catalog_edit.php +++ b/src/admin/catalog_edit.php @@ -33,9 +33,9 @@ if ($dopost == "save") { issend='$issend', sortrank='$sortrank', typename='$typename', - namegk='$namegk', + cnoverview='$cnoverview', enname='$enname', - ennamegk='$ennamegk', + enoverview='$enoverview', bigpic='$bigpic', litimg='$litimg', typedir='$typedir', @@ -158,87 +158,87 @@ while ($row = $dsql->GetObject()) { PutCookie('lastCid', GetTopid($id), 3600 * 24, "/"); if ($dopost == 'time') { ?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
是否支持投稿： - - -
内容模型： - $arr) { - if ($k == $channelid) echo "{$arr['typename']} | {$arr['nid']}"; - } - ?> - 更多模型 -
栏目名称：
排列顺序： （由低 > 高）
浏览权限： - （仅限制栏目里的文档浏览权限） -
文件保存目录：
栏目列表选项： - - - -
默认页的名称：
栏目属性： -
-
- -
- - -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
是否支持投稿： + + +
内容模型： + $arr) { + if ($k == $channelid) echo "{$arr['typename']} | {$arr['nid']}"; + } + ?> + 更多模型 +
栏目名称：
排列顺序： （由低 > 高）
浏览权限： + （仅限制栏目里的文档浏览权限） +
文件保存目录：
栏目列表选项： + + + +
默认页的名称：
栏目属性： +
+
+ +
+ + +
+
$adminMenu2 - + "; \ No newline at end of file diff --git a/src/admin/mychannel_main.php b/src/admin/mychannel_main.php index 2b497692..9232fb34 100644 --- a/src/admin/mychannel_main.php +++ b/src/admin/mychannel_main.php @@ -20,9 +20,9 @@ $dlist->display(); function GetSta($sta, $id) { if ($sta == 1) { - return ($id != -1 ? "启用 > 禁用" : "固定项目"); + return ($id != -1 ? "启用 > 禁用" : "固定项目"); } else { - return "禁用 > 启用"; + return "禁用 > 启用"; } } function IsSystem($s) diff --git a/src/admin/shops_operations_cart.php b/src/admin/shops_operations_cart.php index 7e7e0416..5151d2bf 100644 --- a/src/admin/shops_operations_cart.php +++ b/src/admin/shops_operations_cart.php @@ -11,9 +11,9 @@ require_once(dirname(__FILE__)."/config.php"); require_once(DEDEINC."/datalistcp.class.php"); CheckPurview('shops_Operations'); -if (!isset($oid)) exit("无效操作!"); +if (!isset($oid)) exit("无效操作"); $oid = preg_replace("#[^-0-9A-Z]#", "", $oid); -if (empty($oid)) exit("无效订单号!"); +if (empty($oid)) exit("无效订单号"); $row = $dsql->GetOne("SELECT * FROM `#@__shops_userinfo` WHERE oid='$oid'"); $sql = "SELECT o.*,p.title,p.price as uprice,d.dname FROM `#@__shops_orders` as o left join `#@__shops_products` as p on o.oid=p.oid left join `#@__shops_delivery` as d on d.pid=o.pid WHERE o.oid='$oid'"; $dlist = new DataListCP(); diff --git a/src/admin/shops_operations_userinfo.php b/src/admin/shops_operations_userinfo.php index 3747191c..a03723c1 100644 --- a/src/admin/shops_operations_userinfo.php +++ b/src/admin/shops_operations_userinfo.php @@ -10,13 +10,13 @@ */ require_once(dirname(__FILE__)."/config.php"); CheckPurview('shops_Operations'); -if (!isset($oid)) exit("无效操作!"); +if (!isset($oid)) exit("无效操作"); $oid = preg_replace("#[^-0-9A-Z]#", "", $oid); -if (empty($oid)) exit("无效订单号!"); +if (empty($oid)) exit("无效订单号"); $rows = $dsql->GetOne("SELECT * FROM `#@__shops_userinfo` WHERE oid='$oid' LIMIT 0,1"); if (!is_array($rows)) { $dsql->Close(); - exit("该订单下没相关用户信息!"); + exit("该订单下没相关用户信息"); } $row = $dsql->GetOne("SELECT pid,dprice FROM `#@__shops_orders` WHERE oid='$oid'"); if (is_array($row)) { diff --git a/src/admin/templets/action_search.htm b/src/admin/templets/action_search.htm index 11df2fea..22b1d907 100644 --- a/src/admin/templets/action_search.htm +++ b/src/admin/templets/action_search.htm @@ -26,7 +26,7 @@ - + diff --git a/src/admin/templets/ad_main.htm b/src/admin/templets/ad_main.htm index 4b05a572..ff596456 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -1,4 +1,4 @@ -{dede:config.pagesize value='20' /} +{dede:config.pagesize value='30'/} diff --git a/src/admin/templets/baidunews.htm b/src/admin/templets/baidunews.htm deleted file mode 100644 index 98141e2d..00000000 --- a/src/admin/templets/baidunews.htm +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - 百度新闻地图 - - - - - -

- - - - - - - - - - - - - - - - - - - -
百度新闻地图
-

《互联网新闻开放协议》是百度新闻搜索制定的搜索引擎新闻源收录标准，网站可将发布的新闻内容制作成遵循此开放协议的XML格式的网页（独立于原有的新闻发布形式）供搜索引擎索引

-

详情参见

-

配置的相关参数在 系统设置-其他选项中调整

-

只适用于文章频道，数据表为V6默认的

-
文件名：
状态：