diff --git a/src/admin/article_template_rand.php b/src/admin/article_template_rand.php index dd65d5fe..26e571b3 100644 --- a/src/admin/article_template_rand.php +++ b/src/admin/article_template_rand.php @@ -94,9 +94,9 @@ function DoRand(jobname) 如果您想对旧的文章应用随机模板设置,请点击此对旧文章进行处理(必须设置好模板项) -   设置全部 -   取消全部 -   $okmsg +  设置全部 +  取消全部 +  $okmsg diff --git a/src/admin/catalog_del.php b/src/admin/catalog_del.php index ef810017..cb8ac91a 100644 --- a/src/admin/catalog_del.php +++ b/src/admin/catalog_del.php @@ -9,13 +9,11 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__).'/config.php'); - //检查权限许可 CheckPurview('t_Del,t_AccDel'); require_once(DEDEINC.'/typelink/typeunit.class.admin.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); $id = trim(preg_replace("#[^0-9]#", '', $id)); - //检查栏目操作许可 CheckCatalog($id, "您无权删除本栏目"); if (empty($dopost)) $dopost = ''; @@ -29,7 +27,7 @@ if ($dopost == 'ok') { $dsql->SetQuery("SELECT typename,typedir FROM #@__arctype WHERE id=".$id); $row = $dsql->GetOne(); $wintitle = "删除栏目确认"; -$wecome_info = "栏目管理 >> 删除栏目确认"; +$wecome_info = "栏目管理 > 删除栏目确认"; $win = new OxWindow(); $win->Init('catalog_del.php', 'js/blank.js', 'POST'); $win->AddHidden('id', $id); @@ -38,4 +36,4 @@ $win->AddTitle("您要确实要删除栏目:[{$row['typename']}] 吗"); $win->AddItem('栏目的文件保存目录:', $row['typedir']); $win->AddItem('是否删除文件:', " "); $winform = $win->GetWindow('ok'); -$win->Display(); +$win->Display(); \ No newline at end of file diff --git a/src/admin/catalog_do.php b/src/admin/catalog_do.php index 25d783b6..8212af98 100644 --- a/src/admin/catalog_do.php +++ b/src/admin/catalog_do.php @@ -16,7 +16,6 @@ if (empty($dopost)) { $cid = empty($cid) ? 0 : intval($cid); $unittype = empty($unittype) ? 0 : intval($unittype); $channelid = empty($channelid) ? 0 : intval($channelid); - /*-------------------------- //增加文档 function addArchives(); @@ -105,7 +104,6 @@ function upRank() else if ($dopost == "upRank") { //检查权限许可 CheckPurview('t_Edit,t_AccEdit'); - //检查栏目操作许可 CheckCatalog($cid, "您无权修改本栏目"); $row = $dsql->GetOne("SELECT reid,sortrank FROM #@__arctype WHERE id='$cid'"); @@ -143,12 +141,10 @@ else if ($dopost == "upcatcache") { UpDateCatCache(); $sql = " TRUNCATE TABLE `#@__arctiny`"; $dsql->ExecuteNoneQuery($sql); - //导入普通模型微数据 $sql = "INSERT INTO `#@__arctiny`(id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid) - SELECT id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid FROM `#@__archives` "; + SELECT id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid FROM `#@__archives` "; $dsql->ExecuteNoneQuery($sql); - //导入单表模型微数据 $dsql->SetQuery("SELECT id,addtable FROM `#@__channeltype` WHERE id < -1 "); $dsql->Execute(); @@ -224,7 +220,7 @@ else if ($dopost == 'unitCatalog') { } $typeOptions = $tl->GetOptionArray(0, 0, $channelid); $wintitle = '合并栏目'; - $wecome_info = "栏目管理 >> 合并栏目"; + $wecome_info = "栏目管理 > 合并栏目"; $win = new OxWindow(); $win->Init('catalog_do.php', 'js/blank.js', 'POST'); $win->AddHidden('dopost', 'unitCatalog'); @@ -277,7 +273,7 @@ else if ($dopost == 'moveCatalog') { $channelid = $tl->TypeInfos['channeltype']; $typeOptions = $tl->GetOptionArray(0, 0, $channelid); $wintitle = "移动栏目"; - $wecome_info = "栏目管理 >> 移动栏目"; + $wecome_info = "栏目管理 > 移动栏目"; $win = new OxWindow(); $win->Init('catalog_do.php', 'js/blank.js', 'POST'); $win->AddHidden('dopost', 'moveCatalog'); @@ -305,4 +301,4 @@ else if ($dopost == 'moveCatalog') { ShowMsg('成功移动目录', 'catalog_main.php'); exit(); } -} +} \ 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 3ce130ee..96fde386 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -289,44 +289,38 @@ $actionSearch[8] = array( 'description' => '针对主页、栏目、文档、专题等等进行更新', 'soniterm' => array( 0 => array( - 'title' => '更新主页HTML', - 'description' => '生成网站主页面的HTML', + 'title' => '更新主页', + 'description' => '生成网站主页面', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_homepage.php' ), 1 => array( 'title' => '更新栏目 HTML', - 'description' => '对每个栏目进行静态HTML页面的生成', + 'description' => '对每个栏目进行静态页面的生成', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_list.php' ), 2 => array( 'title' => '更新文档H', - 'description' => '对每个栏目下的文档进行静态HTML页面的生成', + 'description' => '对每个栏目下的文档进行静态页面的生成', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_archives.php' ), 3 => array( - 'title' => '更新网站地图', - 'description' => '生成网站地图的静态HTML页面', - 'purview' => 'sys_MakeHtml', - 'linkurl' => 'makehtml_map_guide.php' - ), - 4 => array( - 'title' => '更新订阅 HTML', + 'title' => '更新订阅', 'description' => '对全站的RSS进行更新', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_rss.php' ), - 5 => array( - 'title' => '获取JS文件', - 'description' => '可以获取某个栏目的js连接', + 4 => array( + 'title' => '更新脚本', + 'description' => '可以获取某个栏目的脚本连接', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_js.php' ), - 6 => array( - 'title' => '更新专题 HTML', - 'description' => '对专题进行静态HTML页面的生成', + 5 => array( + 'title' => '更新专题', + 'description' => '对专题进行静态页面的生成', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_spec.php' ), diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index f495d7ae..42dcc73c 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -109,7 +109,6 @@ $adminMenu1 - diff --git a/src/admin/inc/inc_menu_map.php b/src/admin/inc/inc_menu_map.php index 088934e1..7dac812e 100644 --- a/src/admin/inc/inc_menu_map.php +++ b/src/admin/inc/inc_menu_map.php @@ -66,7 +66,6 @@ $menusMain = " - diff --git a/src/admin/index_body.php b/src/admin/index_body.php index f03ad991..425eadbb 100644 --- a/src/admin/index_body.php +++ b/src/admin/index_body.php @@ -27,87 +27,7 @@ if (empty($dopost)) { include DedeInclude('templets/index_body.htm'); exit(); } -/*--------------------------------- -载入右边内容 -function _getRightSide() { } ----------------------------------*/ -else if ($dopost == 'getRightSide') { - $query = " SELECT COUNT(*) AS dd FROM `#@__member` "; - $row1 = $dsql->GetOne($query); - $query = " SELECT COUNT(*) AS dd FROM `#@__feedback` "; - $row2 = $dsql->GetOne($query); - $chArrNames = array(); - $query = "SELECT id, typename FROM `#@__channeltype` "; - $dsql->Execute('c', $query); - while ($row = $dsql->GetArray('c')) { - $chArrNames[$row['id']] = $row['typename']; - } - $query = "SELECT COUNT(channel) AS dd, channel FROM `#@__arctiny` GROUP BY channel "; - $allArc = 0; - $chArr = array(); - $dsql->Execute('a', $query); - while ($row = $dsql->GetArray('a')) { - $allArc += $row['dd']; - $row['typename'] = $chArrNames[$row['channel']]; - $chArr[] = $row; - } -?> - - - - - - - - - - - - - - - - - - - -
会员数:
文档数:
评论数:
--2 ORDER BY arc.id DESC LIMIT 0, 6 "; - $arcArr = array(); - $dsql->Execute('m', $query); - while ($row = $dsql->GetArray('m')) { - $arcArr[] = $row; - } - AjaxHead(); -?> - - {$row['title']}"; - if ($row['arcrank'] == -1) $linkstr .= "(未审核)"; - ?> - - - - -
- 0) { ?> -
+
$val) { diff --git a/src/admin/makehtml_archives_action.php b/src/admin/makehtml_archives_action.php index 84b66476..c4ab9d9a 100644 --- a/src/admin/makehtml_archives_action.php +++ b/src/admin/makehtml_archives_action.php @@ -90,7 +90,7 @@ if ($tjnum < $totalnum) { exit(); } else { if ($typeid != '') { - ShowMsg("生成文件:$totalnum 总用时:{$ttime} 分钟,现转向当前栏目更新>>", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1"); + ShowMsg("生成文件:$totalnum 总用时:{$ttime} 分钟,现转向当前栏目更新>", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1"); } else { if ($uptype == '') { ShowMsg("完成所有创建任务,生成文件:$totalnum 总用时:{$ttime} 分钟", "javascript:;"); diff --git a/src/admin/makehtml_map_guide.php b/src/admin/makehtml_map_guide.php deleted file mode 100644 index f8250d77..00000000 --- a/src/admin/makehtml_map_guide.php +++ /dev/null @@ -1,12 +0,0 @@ -AddTitle(" 模块管理 >> 安装模块:{$infos['name']}"); + $win->AddTitle(" 模块管理 > 安装模块:{$infos['name']}"); $win->AddHidden("hash", $hash); $win->AddHidden("action", 'setupstart'); $msg = " @@ -291,11 +290,11 @@ else if ($action == 'del') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); - $dev_id = empty($infos['dev_id'])? "未认证" : "{$infos['dev_id']} 未认证"; + $dev_id = empty($infos['dev_id'])? "未认证" : "{$infos['dev_id']} 已认证"; $win = new OxWindow(); $win->Init("module_main.php", "js/blank.js", "post"); $wecome_info = "模块管理"; - $win->AddTitle("模块管理 >> 删除模块:{$infos['name']}"); + $win->AddTitle("模块管理 > 删除模块:{$infos['name']}"); $win->AddHidden('hash', $hash); $win->AddHidden('action', 'delok'); $msg = " @@ -356,11 +355,11 @@ else if ($action == 'uninstall') { else $v['type'] = '文件'; $filelist .= "{$v['type']}|{$v['name']}\r\n"; } - $dev_id = empty($infos['dev_id'])? "未认证" : "{$infos['dev_id']} 未认证"; + $dev_id = empty($infos['dev_id'])? "未认证" : "{$infos['dev_id']} 已认证"; $win = new OxWindow(); $win->Init("module_main.php", "js/blank.js", "post"); $wecome_info = "模块管理"; - $win->AddTitle("模块管理 >> 卸载模块:{$infos['name']}"); + $win->AddTitle("模块管理 > 卸载模块:{$infos['name']}"); $win->AddHidden("hash", $hash); $win->AddHidden("action", 'uninstallok'); $msg = " @@ -390,7 +389,8 @@ else if ($action == 'uninstall') { 浏览 - 模块包含的文件:
(文件路径相对于当前目录)  + 模块包含的文件(文件路径相对于当前目录) + @@ -460,7 +460,7 @@ else if ($action == 'showreadme') { $win = new OxWindow(); $win->Init("module_main.php", "js/blank.js", "post"); $wecome_info = "模块管理"; - $win->AddTitle("模块管理 >> 使用说明:"); + $win->AddTitle("模块管理 > 使用说明:"); $win->AddMsgItem("
$msg
"); $winform = $win->GetWindow("hand"); $win->Display(); @@ -498,11 +498,11 @@ else if ($action == 'view') { $setupinfo = "未安装 安装"; } - $dev_id = empty($infos['dev_id'])? "安装{$s}" : "{$infos['dev_id']} {$s}"; + $dev_id = empty($infos['dev_id'])? "安装{$s}" : "{$infos['dev_id']} 安装{$s}"; $win = new OxWindow(); $win->Init("", "js/blank.js", ""); $wecome_info = "模块管理"; - $win->AddTitle("模块管理 >> 模块详情:{$infos['name']}"); + $win->AddTitle("模块管理 > 模块详情:{$infos['name']}"); $msg = " @@ -530,7 +530,8 @@ else if ($action == 'view') { - + + - - - - -
浏览
模块包含的文件:
(文件路径相对于当前目录)
 模块包含的文件(文件路径相对于当前目录)
diff --git a/src/admin/module_upload.php b/src/admin/module_upload.php index 5610c517..0c5320a1 100644 --- a/src/admin/module_upload.php +++ b/src/admin/module_upload.php @@ -76,7 +76,7 @@ if ($action == 'upload') { $win = new OxWindow(); $win->Init("module_upload.php", "js/blank.js", "POST' enctype='multipart/form-data"); $win->mainTitle = "模块管理"; - $wecome_info = "模块管理 >> 上传模块"; + $wecome_info = "模块管理 > 上传模块"; $win->AddTitle('请选择要上传的文件:'); $win->AddHidden("action", 'upload'); $msg = " diff --git a/src/admin/plus_edit.php b/src/admin/plus_edit.php index 406d7620..37da4055 100644 --- a/src/admin/plus_edit.php +++ b/src/admin/plus_edit.php @@ -32,7 +32,7 @@ if ($dopost == "show") { $win->AddHidden("dopost", $dopost); $win->AddHidden("aid", $aid); $win->AddTitle("您确实要删除'".$title."'这个插件"); - $win->AddMsgItem("警告:在这里删除仅仅删除菜单项,要干净删除请在模块管理处删除

模块管理>>"); + $win->AddMsgItem("警告:在这里删除仅仅删除菜单项,要干净删除请在模块管理处删除

模块管理>"); $winform = $win->GetWindow("ok"); $win->Display(); exit(); diff --git a/src/admin/public_guide.php b/src/admin/public_guide.php index a30dd80c..c46a4d03 100644 --- a/src/admin/public_guide.php +++ b/src/admin/public_guide.php @@ -11,7 +11,6 @@ require_once(dirname(__FILE__)."/config.php"); require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($action)) $action = ''; - /*-------------------- function __SetDefault(); ----------------------*/ @@ -25,18 +24,18 @@ if ($action == 'setdefault') { $win->Init(); $win->mainTitle = "内容发布向导"; $wecome_info = "内容发布向导"; - $win->AddTitle("内容发布向导 >> 设置默认发布表单"); + $win->AddTitle("内容发布向导 > 设置默认发布表单"); if ($cid == 0) { $msg = " - 成功取消默认发布表单 -
- 您目前想要进行的操作:返回发布向导页 + 成功取消默认发布表单 +
+ 您目前想要进行的操作:返回发布向导页 "; } else { $msg = " 成功保存默认发布表单,以后点击“内容发布”面板将直接跳转到您选择的内容发布页
- 您目前想要进行的操作:转到默认发布表单   返回发布向导页 + 您目前想要进行的操作:转到默认发布表单   返回发布向导页 "; } $win->AddMsgItem("
$msg
"); @@ -44,13 +43,11 @@ if ($action == 'setdefault') { $win->Display(); exit(); } - //以下为正常浏览的内容 /*-------------------- function __PageShow(); ----------------------*/ $row = $dsql->GetOne("SELECT id,addcon FROM `#@__channeltype` WHERE isdefault='1' "); - //已经设置了默认发布表单 if (is_array($row) && $action != 'edit') { $addcon = $row['addcon']; @@ -62,17 +59,15 @@ if (is_array($row) && $action != 'edit') { require_once(DEDEADMIN.'/'.$addcon); exit(); } - //没有设置默认发布表单 else { $dsql->SetQuery("SELECT id,typename,mancon,isdefault,addtable FROM `#@__channeltype` WHERE id<>-1 And isshow=1 "); $dsql->Execute(); } include DedeInclude('templets/public_guide.htm'); - //获取频道栏目数 function GetCatalogs(&$dsql, $cid) { $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctype` WHERE channeltype='$cid' "); return (!is_array($row) ? '0' : $row['dd']); -} +} \ No newline at end of file diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php index eac7e8ae..6a901d03 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -11,13 +11,13 @@ require_once(dirname(__FILE__).'/config.php'); CheckPurview('sys_ArcBatch'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); -//ShowMsg("目前暂不需要此工具,以后有需要系统会进行自动升级这个程序
<<点击此返回>>", "javascript:;"); +//ShowMsg("目前暂不需要此工具,以后有需要系统会进行自动升级这个程序
<<点击此返回>", "javascript:;"); //exit(); if (empty($dopost)) { $win = new OxWindow(); $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); $win->mainTitle = "系统修复工具"; - $wecome_info = "系统主页 >> 系统错误修复工具"; + $wecome_info = "系统主页 > 系统错误修复工具"; $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误'); $msg = "
@@ -32,7 +32,7 @@ if (empty($dopost)) { 4、检测微表与主表数据一致性


- 点击此开始进行常规检测>> + 点击此开始进行常规检测>


@@ -51,7 +51,7 @@ else if ($dopost == 1) { $win = new OxWindow(); $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); $win->mainTitle = "系统修复工具"; - $wecome_info = "系统错误修复工具 >> 检测数据结构"; + $wecome_info = "系统错误修复工具 > 检测数据结构"; $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误'); $msg = "
@@ -65,7 +65,7 @@ else if ($dopost == 1) { 2、更新数据库archives表时出错
3、列表显示数据目与实际文档数不一致

- 点击此检测微表正确性>> + 点击此检测微表正确性>


@@ -104,7 +104,7 @@ else if ($dopost == 2) { } } $msg .= "※总有效记录数:{$allarcnum}
"; - $errall = "完成修正或无错误返回>>"; + $errall = "完成修正或无错误返回>"; $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` "); $msg .= "※微统计表记录数:{$row['dd']}
"; if ($row['dd'] == $allarcnum) { @@ -129,14 +129,14 @@ else if ($dopost == 2) { $msg .= "

修正记录成功


"; } else { $msg .= "

修正记录失败,建议进行高级综合检测


"; - $errall = " 进行高级结合性检测>> "; + $errall = " 进行高级结合性检测> "; } } UpDateCatCache(); $win = new OxWindow(); $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); $win->mainTitle = "系统修复工具"; - $wecome_info = "系统错误修复工具 >> 检测微表正确性"; + $wecome_info = "系统错误修复工具 > 检测微表正确性"; $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误'); $msg = "
@@ -197,7 +197,7 @@ else if ($dopost == 3) { $win = new OxWindow(); $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); $win->mainTitle = "系统修复工具"; - $wecome_info = "系统错误修复工具 >> 高级综合检测修复"; + $wecome_info = "系统错误修复工具 > 高级综合检测修复"; $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误'); $msg = "
@@ -206,7 +206,7 @@ else if ($dopost == 3) { 完成所有修复操作,移除错误记录 {$errnum} 条

- 完成修正或无错误返回>> + 完成修正或无错误返回>
diff --git a/src/admin/templets/article_result_same.htm b/src/admin/templets/article_result_same.htm index f25fe30e..a25d6cc4 100644 --- a/src/admin/templets/article_result_same.htm +++ b/src/admin/templets/article_result_same.htm @@ -48,9 +48,7 @@ function noSelAll() - + @@ -60,9 +58,9 @@ function noSelAll() - - - + + + GetArray()) diff --git a/src/admin/templets/catalog_main.htm b/src/admin/templets/catalog_main.htm index 12a8c509..cf89cb3e 100644 --- a/src/admin/templets/catalog_main.htm +++ b/src/admin/templets/catalog_main.htm @@ -114,9 +114,7 @@ td,th{padding:.25rem}
- ·重复文档列表: - 重复文档列表:
选择 重复数量 文档标题 选择重复数量文档标题
- -
- - 网站栏目管理 - + 网站栏目管理 增加顶级栏目 批量增加栏目 @@ -129,7 +127,7 @@ td,th{padding:.25rem} - + diff --git a/src/admin/templets/diy_edit.htm b/src/admin/templets/diy_edit.htm index cc9b57d2..89ed76f1 100644 --- a/src/admin/templets/diy_edit.htm +++ b/src/admin/templets/diy_edit.htm @@ -52,8 +52,7 @@ diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm index 2dbf7ac0..313496d9 100644 --- a/src/admin/templets/index.htm +++ b/src/admin/templets/index.htm @@ -41,7 +41,7 @@
温馨提示(使用鼠标右键弹出菜单)修改栏目属性(使用鼠标右键弹出菜单) 展开栏目 diff --git a/src/admin/templets/content_select_list.htm b/src/admin/templets/content_select_list.htm index 9e08d1ba..91d1ad97 100644 --- a/src/admin/templets/content_select_list.htm +++ b/src/admin/templets/content_select_list.htm @@ -47,12 +47,9 @@ - - + @@ -71,9 +68,7 @@ onMouseOut="javascript:this.bgColor='#FFFFFF';" height="26"> - + @@ -84,11 +79,8 @@ {/dede:datalist} @@ -113,15 +105,9 @@ - - - + + +
- §文章列表 - 文章列表
{dede:field.id/} - {dede:field.title/} - {dede:field.title/} {dede:field.senddate function="GetDateMk(@me)" /} {dede:field.typeid function='GetTypename(@me)'/} {dede:field.click/}
-   全选 -   取消 -   把选定值加到列表
- 关键词: - - - - - 关键词:
- 自定义表单管理 > 修改自定义表单: - (修改表名不会创建新表,如果您不懂手工处理这些表,请不要修改) + 自定义表单管理 > 修改自定义表单(修改表名不会创建新表,如果您不懂手工处理这些表,请不要修改)
@@ -56,24 +46,24 @@ table.stattable td.today { - - - - + + + + - - - - - + + + + + - - - - - - + + + + + +
今日............
昨日............昨日
历史累计............
历史累计
@@ -82,58 +72,89 @@ table.stattable td.today {
-
更新消息
+
 系统信息
- "; - echo "安全操作:备份还原病毒扫描错误修复
"; - echo ""; - ?> + "; ?>
+ + + + + + + +
+
+

操作系统

+ +
+
+
+

Web服务器

+ +
+
+
+

服务器IP

+ +
+
+
+

PHP版本

+ +
+
-
版本授权
+
 版本授权
正在载入
-
基本信息
+
- - - - - - - - - - - - - - - - - - - - - -
操作系统:Web服务器:
网站域名:网站地址:
您的级别:getUserType()==10) {echo "总管理员";} else if($cuserLogin->getUserType()==5) {echo "频道总编";} else {echo "信息采集员或其它管理员";}?>版本信息:
PHP版本:GD版本:
上传文件:远程连接:
+
- +
 最新文档
- + + -2 ORDER BY arc.id DESC LIMIT 0,12"; + $arcArr = array(); + $dsql->Execute('m', $query); + while($row = $dsql->GetArray('m')) + { + $arcArr[] = $row; + } + ?> + 1) + { + foreach($arcArr as $row) + { + if(trim($row['editcon'])==''){ + $row['editcon'] = 'archives_edit.php'; + } + $rowarcrank = $row['arcrank']==-1? " 未审核":""; + $pubdate = GetDateMk($row['pubdate']); + echo ""; + } + } else { + ?> + + +
{$row['title']}{$rowarcrank}{$pubdate}
暂无文档
@@ -187,21 +208,6 @@ table.stattable td.today { }); - [增大] [缩小] -
-
-
- -
-
- - \ No newline at end of file diff --git a/src/admin/templets/module_main.htm b/src/admin/templets/module_main.htm index 1bb32ae7..a927048a 100644 --- a/src/admin/templets/module_main.htm +++ b/src/admin/templets/module_main.htm @@ -24,8 +24,8 @@
模块管理
@@ -35,13 +35,13 @@ -
模块管理 > 模块列表:
-
- 全部 | - 模块 | - 模板 | - 小插件 | - 补丁 +
模块管理 > 模块列表:
+ diff --git a/src/admin/tpl.php b/src/admin/tpl.php index 4a27546d..a6344422 100644 --- a/src/admin/tpl.php +++ b/src/admin/tpl.php @@ -120,7 +120,7 @@ else if ($action == 'upload') { make_hash(); $win->Init("tpl.php", "js/blank.js", "POST' enctype='multipart/form-data' "); $win->mainTitle = "模块管理"; - $wecome_info = "模板管理 >> 上传模板"; + $wecome_info = "模板管理 > 上传模板"; $win->AddTitle('请选择要上传的文件:'); $win->AddHidden("action", 'uploadok'); $msg = " @@ -231,7 +231,7 @@ else if ($action == 'savetagfile') { "; $wintitle = "成功修改/创建文件"; - $wecome_info = "标签源码碎片管理 >> 修改/新建标签"; + $wecome_info = "标签源码碎片管理 > 修改/新建标签"; $win = new OxWindow(); $win->AddTitle("修改/新建标签:"); $win->AddMsgItem($msg); diff --git a/src/apps/arcmulti.php b/src/apps/arcmulti.php index 77d7c0de..9cbc684f 100755 --- a/src/apps/arcmulti.php +++ b/src/apps/arcmulti.php @@ -79,7 +79,7 @@ if($tagid !='') $row['imglink'] = "".$row['image'].""; $row['fulltitle'] = $row['title']; $row['title'] = cn_substr($row['title'],$titlelen); - if($row['color']!='') $row['title'] = "".$row['title'].""; + if($row['color']!='') $row['title'] = "".$row['title'].""; if(preg_match('#b#', $row['flag'])) $row['title'] = "".$row['title'].""; //$row['title'] = "".$row['title'].""; diff --git a/src/apps/showphoto.php b/src/apps/showphoto.php index 4d891f44..0b223038 100755 --- a/src/apps/showphoto.php +++ b/src/apps/showphoto.php @@ -74,7 +74,7 @@ $nextlink = 'javascript:;'; if ($nextSrc != '') { $nextlink = "showphoto.php?aid={$aid}&src=".urlencode($nextSrc)."&npos=".($npos + 1); if ($pageGuide != "") $pageGuide .= " | "; - $pageGuide .= "下一幅图片>>"; + $pageGuide .= "下一幅图片>"; } else { $pageGuide .= " | 没有了"; } diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php index 4f072d98..943a1880 100755 --- a/src/system/archive/freelist.class.php +++ b/src/system/archive/freelist.class.php @@ -568,7 +568,7 @@ class FreeList $row['templeturl'] = $GLOBALS['cfg_templeturl']; $row['title'] = cn_substr($row['title'], $titlelen); if ($row['color'] != "") { - $row['title'] = "".$row['title'].""; + $row['title'] = "".$row['title'].""; } if (preg_match("#c#", $row['flag'])) { $row['title'] = "".$row['title'].""; diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php index ca63dba8..76abbf0c 100755 --- a/src/system/archive/listview.class.php +++ b/src/system/archive/listview.class.php @@ -792,7 +792,7 @@ class ListView $row['fulltitle'] = $row['title']; $row['title'] = cn_substr($row['title'], $titlelen); if ($row['color'] != '') { - $row['title'] = "".$row['title'].""; + $row['title'] = "".$row['title'].""; } if (preg_match('/c/', $row['flag'])) { $row['title'] = "".$row['title'].""; @@ -922,6 +922,16 @@ class ListView if (preg_match('/end/i', $listitem)) $plist .= $endpage; if (preg_match('/option/i', $listitem)) $plist .= $optionlist; if (preg_match('/info/i', $listitem)) $plist .= $maininfo; + //伪静态分页处理 + if ($cfg_rewrite == 'Y') + { + + $plist = str_replace('.php?tid=','-',$plist); + $plist = preg_replace("/&TotalResult=(\d+)/i","",$plist);//去掉总结果数值 + //目录版 + $plist = preg_replace("/&PageNo=(\d+)/i",'-\\1',$plist); + //网页版$plist = preg_replace("/&PageNo=(\d+)/i",'-\\1.html',$plist); + } return $plist; } /** diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php index fef66e8d..98b186ad 100755 --- a/src/system/archive/taglist.class.php +++ b/src/system/archive/taglist.class.php @@ -69,7 +69,7 @@ class TagList $this->TagInfos = $this->dsql->GetOne("Select * From `#@__tagindex` where tag like '{$this->Tag}' "); if (!is_array($this->TagInfos)) { $fullsearch = $GLOBALS['cfg_phpurl']."/search.php?keyword=".$this->Tag."&searchtype=titlekeyword"; - $msg = "系统无此标签,可能已经移除

您还可以尝试通过搜索程序去搜索这个关键词:前往搜索>>"; + $msg = "系统无此标签,可能已经移除

您还可以尝试通过搜索程序去搜索这个关键词:前往搜索>"; ShowMsg($msg, "-1"); exit(); } @@ -380,7 +380,7 @@ class TagList $row['fulltitle'] = $row['title']; $row['title'] = cn_substr($row['title'], $titlelen); if ($row['color'] != '') { - $row['title'] = "".$row['title'].""; + $row['title'] = "".$row['title'].""; } if (preg_match('/c/', $row['flag'])) { $row['title'] = "".$row['title'].""; diff --git a/src/system/helpers/channelunit.helper.php b/src/system/helpers/channelunit.helper.php index 84a47d3c..4fe39bdf 100755 --- a/src/system/helpers/channelunit.helper.php +++ b/src/system/helpers/channelunit.helper.php @@ -145,9 +145,11 @@ if (!function_exists('GetFileName')) { $typeid = -1; } if ($rank != 0 || $ismake == -1 || $typeid == 0 || $money > 0) { - //动态文章 + //伪静态文档,Nginx伪静态规则参考:rewrite ^/([0-9]+).html$ /apps/view.php?arcID=$1;rewrite ^/([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2; if ($cfg_rewrite == 'Y') { - return $GLOBALS["cfg_plus_dir"]."/view-".$aid.'-1.html'; + //目录版return "/article/".$aid.""; + //网页版 + return "/".$aid.".html"; } else { return $GLOBALS['cfg_phpurl']."/view.php?aid=$aid"; } @@ -201,9 +203,11 @@ if (!function_exists('GetTypeUrl')) { global $cfg_typedir_df; $typedir = MfTypedir($typedir); $sitepath = MfTypedir($sitepath); - if ($isdefault == -1) { - //动态 - $reurl = $GLOBALS['cfg_phpurl']."/list.php?tid=".$typeid; + //伪静态栏目,Nginx伪静态规则参考:rewrite ^/list([0-9]+)$ /apps/list.php?tid=$1;rewrite ^/list([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2; + if($isdefault==-1) { + //目录版 + $reurl = "/list".$typeid.""; + //网页版$reurl = "/list".$typeid.".html"; } else if ($ispart == 2) { //跳转网址 $reurl = $typedir; diff --git a/src/system/taglib/arclist.lib.php b/src/system/taglib/arclist.lib.php index 9016c126..1837d8fe 100755 --- a/src/system/taglib/arclist.lib.php +++ b/src/system/taglib/arclist.lib.php @@ -369,7 +369,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele $row['imglink'] = "".$row['image'].""; $row['fulltitle'] = $row['title']; $row['title'] = cn_substr($row['title'], $titlelen); - if ($row['color'] != '') $row['title'] = "".$row['title'].""; + if ($row['color'] != '') $row['title'] = "".$row['title'].""; if (preg_match('#b#', $row['flag'])) $row['title'] = "".$row['title'].""; //$row['title'] = "".$row['title'].""; $row['textlink'] = "".$row['title'].""; diff --git a/src/system/taglib/arcpagelist.lib.php b/src/system/taglib/arcpagelist.lib.php index e1606459..d38b1e94 100755 --- a/src/system/taglib/arcpagelist.lib.php +++ b/src/system/taglib/arcpagelist.lib.php @@ -52,7 +52,7 @@ function multipage($allItemTotal, $currPageNum, $pageSize, $tagid = '') //第一页显示 $firstPage = ($currPageNum <= 1) ? $currPageNum."<<" : "1<<"; //最后一页显示 - $lastPage = ($currPageNum >= $pagesNum) ? ">>".$currPageNum : ">>".$pagesNum.""; + $lastPage = ($currPageNum >= $pagesNum) ? ">".$currPageNum : ">".$pagesNum.""; //上一页显示 $prePage = ($currPageNum <= 1) ? "上页" : "[上一页]"; //下一页显示 diff --git a/src/system/taglib/infolink.lib.php b/src/system/taglib/infolink.lib.php index 4ff021cb..ba3fe69a 100755 --- a/src/system/taglib/infolink.lib.php +++ b/src/system/taglib/infolink.lib.php @@ -10,25 +10,20 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @link https://www.dedebiz.com */ require_once(DEDEINC.'/enums.func.php'); - - $cachefile = DEDESTATIC.'/enums/nativeplace.json'; $data = json_decode(file_get_contents($cachefile)); foreach ($data as $key => $value) { $GLOBALS['em_nativeplaces'][$key] = $value; } - $cachefile = DEDESTATIC.'/enums/infotype.json'; $data = json_decode(file_get_contents($cachefile)); foreach ($data as $key => $value) { $GLOBALS['em_infotypes'][$key] = $value; } - function lib_infolink(&$ctag, &$refObj) { global $dsql, $nativeplace, $infotype, $hasSetEnumJs, $cfg_cmspath, $cfg_mainsite; global $em_nativeplaces, $em_infotypes; - //属性处理 //$attlist="row|12,titlelen|24"; //FillAttsDefault($ctag->CAttribute->Items,$attlist); @@ -69,7 +64,7 @@ function lib_infolink(&$ctag, &$refObj) $sontype = (($nativeplace % 500 != 0) ? $nativeplace : 0); $toptype = (($nativeplace % 500 == 0) ? $nativeplace : ($nativeplace - ($nativeplace % 500))); - $fields['nativeplace'] = " {$em_nativeplaces[$toptype]} >> "; + $fields['nativeplace'] = " {$em_nativeplaces[$toptype]} > "; foreach ($em_nativeplaces as $eid => $em) { if ($eid < $toptype + 1 || $eid > $toptype + 499) continue; if ($eid == $nativeplace) { @@ -94,7 +89,7 @@ function lib_infolink(&$ctag, &$refObj) } else { $sontype = (($infotype % 500 != 0) ? $infotype : 0); $toptype = (($infotype % 500 == 0) ? $infotype : ($infotype - ($infotype % 500))); - $fields['infotype'] .= "{$em_infotypes[$toptype]} >> "; + $fields['infotype'] .= "{$em_infotypes[$toptype]} > "; foreach ($em_infotypes as $eid => $em) { if ($eid < $toptype + 1 || $eid > $toptype + 499) continue; if ($eid == $infotype) { diff --git a/src/system/taglib/likearticle.lib.php b/src/system/taglib/likearticle.lib.php index 8e536b9e..302d58a3 100755 --- a/src/system/taglib/likearticle.lib.php +++ b/src/system/taglib/likearticle.lib.php @@ -141,7 +141,7 @@ function lib_likearticle(&$ctag, &$refObj) $row['imglink'] = "".$row['image'].""; $row['fulltitle'] = $row['title']; $row['title'] = cn_substr($row['title'], $titlelen); - if ($row['color'] != '') $row['title'] = "".$row['title'].""; + if ($row['color'] != '') $row['title'] = "".$row['title'].""; if (preg_match('#b#', $row['flag'])) $row['title'] = "".$row['title'].""; $row['textlink'] = "".$row['title'].""; $row['plusurl'] = $row['phpurl'] = $GLOBALS['cfg_phpurl']; diff --git a/src/system/taglib/relation.lib.php b/src/system/taglib/relation.lib.php index ddb3bd2f..d6a45805 100644 --- a/src/system/taglib/relation.lib.php +++ b/src/system/taglib/relation.lib.php @@ -129,7 +129,7 @@ function lib_relation(&$ctag, &$refObj) $row['imglink'] = "".$row['image'].""; $row['fulltitle'] = $row['title']; $row['title'] = cn_substr($row['title'], $titlelen); - if (isset($row['color']) && $row['color'] != '') $row['title'] = "".$row['title'].""; + if (isset($row['color']) && $row['color'] != '') $row['title'] = "".$row['title'].""; if (preg_match('#b#', $row['flag'])) $row['title'] = "".$row['title'].""; $row['textlink'] = "".$row['title'].""; $row['plusurl'] = $row['phpurl'] = $GLOBALS['cfg_phpurl']; diff --git a/src/system/userlogin.class.php b/src/system/userlogin.class.php index 23348bd6..083e676b 100755 --- a/src/system/userlogin.class.php +++ b/src/system/userlogin.class.php @@ -54,7 +54,7 @@ function TestPurview($n) function CheckPurview($n) { if (!TestPurview($n)) { - ShowMsg("对不起,您没有权限执行此操作

点击此返回上一页>>", 'javascript:;'); + ShowMsg("对不起,您没有权限执行此操作

点击此返回上一页>", 'javascript:;'); exit(); } } @@ -90,7 +90,7 @@ function CheckCatalog($cid, $msg) return TRUE; } if (!in_array($cid, $admin_catalogs)) { - ShowMsg(" $msg

点击此返回上一页>>", 'javascript:;'); + ShowMsg(" $msg

点击此返回上一页>", 'javascript:;'); exit(); } return TRUE; diff --git a/src/user/content_sg_list.php b/src/user/content_sg_list.php index 9d029e22..6f3025c6 100755 --- a/src/user/content_sg_list.php +++ b/src/user/content_sg_list.php @@ -19,7 +19,6 @@ $channelid = isset($channelid) && is_numeric($channelid) ? $channelid : 0; $mtypesid = isset($mtypesid) && is_numeric($mtypesid) ? $mtypesid : 0; if (!isset($keyword)) $keyword = ''; if (!isset($arcrank)) $arcrank = ''; - $positionname = ''; $menutype = 'content'; $mid = $cfg_ml->M_ID; @@ -30,17 +29,15 @@ if (!is_array($cInfos)) { exit(); } $arcsta = $cInfos['arcsta']; - //禁止访问无权限的模型 if ($cInfos['usertype'] != '' && $cInfos['usertype'] != $cfg_ml->M_MbType) { ShowMsg('您无权限访问该部分', '-1'); exit(); } - if ($cid == 0) { - $positionname = $cInfos['typename']." >> "; + $positionname = $cInfos['typename']." > "; } else { - $positionname = str_replace($cfg_list_symbol, " >> ", $tl->GetPositionName())." >> "; + $positionname = str_replace($cfg_list_symbol, " > ", $tl->GetPositionName())." > "; } $whereSql = " WHERE arc.channel = '$channelid' AND arc.mid='$mid' "; if ($keyword != '') { @@ -58,12 +55,11 @@ if ($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,arc.arcrank - FROM `{$cInfos['addtable']}` arc - LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid - $whereSql - ORDER BY arc.aid desc "; + FROM `{$cInfos['addtable']}` arc + LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid + $whereSql + ORDER BY arc.aid desc "; $dlist = new DataListCP(); $dlist->pageSize = 20; $dlist->SetParameter("dopost", "listArchives"); @@ -72,4 +68,4 @@ $dlist->SetParameter("cid", $cid); $dlist->SetParameter("channelid", $channelid); $dlist->SetTemplate(DEDEMEMBER."/templets/content_sg_list.htm"); $dlist->SetSource($query); -$dlist->Display(); +$dlist->Display(); \ No newline at end of file