diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php index e47ad26c..75d36dae 100644 --- a/src/admin/article_description_main.php +++ b/src/admin/article_description_main.php @@ -82,7 +82,7 @@ if ($dojob == '') { } $dvlen = $tjlen * 2; $tjsta = "
"; - $tjsta .= "
完成处理文档总数的：$tjlen %，继续执行任务..."; + $tjsta .= "
完成处理文档总数的：$tjlen %，继续执行任务"; $nurl = "article_description_main.php?totalnum=$totalnum&startdd={$startdd}&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}"; ShowMsg($tjsta, $nurl, 0, 500); exit(); @@ -143,7 +143,7 @@ if ($dojob == '') { } $dvlen = $tjlen * 2; $tjsta = "
"; - $tjsta .= "
完成处理文档总数的：$tjlen %，继续执行任务..."; + $tjsta .= "
完成处理文档总数的：$tjlen %，继续执行任务"; if ($tjnum < $totalnum) { $nurl = "article_description_main.php?totalnum=$totalnum&startdd=".($startdd + $pagesize)."&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}"; diff --git a/src/admin/article_keywords_make.php b/src/admin/article_keywords_make.php index 8ac9d8f4..12b05db9 100644 --- a/src/admin/article_keywords_make.php +++ b/src/admin/article_keywords_make.php @@ -15,7 +15,7 @@ CheckPurview('sys_Keyword'); if (empty($dopost)) $dopost = ''; //分析已存在的关键字（适用于默认的文章模型） if ($dopost == 'analyse') { - echo "正在读取关键字数据库...
\r\n"; + echo "正在读取关键字数据库
\r\n"; flush(); $ws = $wserr = $wsnew = ""; $dsql->SetQuery("SELECT * FROM `#@__keywords`"); @@ -26,7 +26,7 @@ if ($dopost == 'analyse') { } echo "完成关键字数据库的载入
\r\n"; flush(); - echo "读取档案数据库，并对禁用的关键字和生字进行处理...
\r\n"; + echo "读取档案数据库，并对禁用的关键字和生字进行处理
\r\n"; flush(); $dsql->SetQuery("SELECT id,keywords FROM `#@__archives`"); $dsql->Execute(); @@ -57,10 +57,10 @@ if ($dopost == 'analyse') { echo "完成档案数据库的处理
\r\n"; flush(); if (is_array($wsnew)) { - echo "对关键字进行排序...
\r\n"; + echo "对关键字进行排序
\r\n"; flush(); arsort($wsnew); - echo "把关键字保存到数据库...
\r\n"; + echo "把关键字保存到数据库
\r\n"; flush(); foreach ($wsnew as $k => $v) { if (strlen($k) > 20) { @@ -189,7 +189,7 @@ else if ($dopost == 'fetch') { $dvlen = $tjlen * 2; $tjsta = "
"; - $tjsta .= "
完成处理文档总数的：$tjlen %，位置：{$startdd}，继续执行任务..."; + $tjsta .= "
完成处理文档总数的：$tjlen %，位置：{$startdd}，继续执行任务"; if ($tjnum < $totalnum) { $nurl = "article_keywords_make.php?dopost=fetch&totalnum=$totalnum&startdd=".($startdd + $pagesize)."&pagesize=$pagesize"; diff --git a/src/admin/article_template_rand.php b/src/admin/article_template_rand.php index b82681ba..c20f79ae 100644 --- a/src/admin/article_template_rand.php +++ b/src/admin/article_template_rand.php @@ -91,7 +91,7 @@ function DoRand(jobname) } diff --git a/src/admin/catalog_do.php b/src/admin/catalog_do.php index f813e9f4..f740e515 100644 --- a/src/admin/catalog_do.php +++ b/src/admin/catalog_do.php @@ -95,7 +95,7 @@ else if ($dopost == "viewSgPage") { require_once(DEDEINC."/arc.listview.class.php"); $lv = new ListView($cid); $pageurl = $lv->MakeHtml(); - ShowMsg("更新缓冲，请稍后...", $pageurl); + ShowMsg("更新缓冲，请稍后", $pageurl); exit(); } /*------------------------ @@ -117,7 +117,7 @@ else if ($dopost == "upRank") { $dsql->ExecuteNoneQuery("UPDATE #@__arctype SET sortrank='$sortrank' WHERE id='$cid'"); } UpDateCatCache(); - ShowMsg("操作成功，返回目录...", "catalog_main.php"); + ShowMsg("操作成功，返回目录", "catalog_main.php"); exit(); } else if ($dopost == "upRankAll") { //检查权限许可 @@ -132,7 +132,7 @@ else if ($dopost == "upRank") { } } UpDateCatCache(); - ShowMsg("操作成功，正在返回...", "catalog_main.php"); + ShowMsg("操作成功，正在返回", "catalog_main.php"); exit(); } /*-------------------------- @@ -164,7 +164,7 @@ else if ($dopost == "upcatcache") { $doarray[$tb] = 1; } } - ShowMsg("操作成功，正在返回...", "catalog_main.php"); + ShowMsg("操作成功，正在返回", "catalog_main.php"); exit(); } /*--------------------- diff --git a/src/admin/content_batchup_action.php b/src/admin/content_batchup_action.php index 0dd55504..70706ad8 100644 --- a/src/admin/content_batchup_action.php +++ b/src/admin/content_batchup_action.php @@ -69,7 +69,7 @@ if ($action == 'check') { $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET arcrank=0 WHERE id='{$row->id}'"); } } - ShowMsg("完成数据库的审核处理，准备更新HTML...", $jumpurl); + ShowMsg("完成数据库的审核处理，准备更新HTML", $jumpurl); exit(); } //批量删除 @@ -156,9 +156,9 @@ else if ($action == 'move') { $jumpurl = "makehtml_archives_action.php?endid=$endid&startid=$startid"; $jumpurl .= "&typeid=$newtypeid&pagesize=20&seltime=$seltime"; $jumpurl .= "&stime=".urlencode($starttime)."&etime=".urlencode($endtime); - ShowMsg("成功移动 $tdd 条记录，准备重新生成HTML...", $jumpurl); + ShowMsg("成功移动 $tdd 条记录，准备重新生成HTML", $jumpurl); } else { - ShowMsg("完成操作，没移动任何数据...", "javascript:;"); + ShowMsg("完成操作，没移动任何数据", "javascript:;"); } } //删除空标题内容 diff --git a/src/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php index 049c0783..58a49351 100644 --- a/src/admin/dialog/select_mimages.php +++ b/src/admin/dialog/select_mimages.php @@ -190,7 +190,7 @@ button+button{margin-left:10px} document.querySelectorAll('#file_list li.up-no').forEach((el,i)=>{ el.classList ? el.classList.add('up-now') : el.className+=' up-now'; }); - e.target.innerText='上传中...'; + e.target.innerText='上传中'; upAllFiles(0); } }); diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php index a05756b6..3ce130ee 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -301,7 +301,7 @@ $actionSearch[8] = array( 'linkurl' => 'makehtml_list.php' ), 2 => array( - 'title' => '更新文档HTML', + 'title' => '更新文档H', 'description' => '对每个栏目下的文档进行静态HTML页面的生成', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_archives.php' @@ -313,7 +313,7 @@ $actionSearch[8] = array( 'linkurl' => 'makehtml_map_guide.php' ), 4 => array( - 'title' => '更新RSS文件 HTML', + 'title' => '更新订阅 HTML', 'description' => '对全站的RSS进行更新', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_rss.php' diff --git a/src/admin/inc/inc_archives_all.php b/src/admin/inc/inc_archives_all.php index 78178eb8..06a9c941 100644 --- a/src/admin/inc/inc_archives_all.php +++ b/src/admin/inc/inc_archives_all.php @@ -84,22 +84,22 @@ function GetFormItem($ctag) $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; } else if ($ctag->GetAtt("type") == "img") { - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; } else if ($ctag->GetAtt("type") == "media") { - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; } else if ($ctag->GetAtt("type") == "addon") { - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; } else if ($ctag->GetAtt("type") == "media") { - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; @@ -309,17 +309,17 @@ function GetFormItemValue($ctag, $fvalue) } $ntag = $ndtp->GetTag("img"); $fvalue = trim($ntag->GetInnerText()); - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; } else if ($ctag->GetAtt("type") == "media") { - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; } else if ($ctag->GetAtt("type") == "addon") { - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index c954ea1e..89add1b2 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -111,7 +111,7 @@ $adminMenu1 - + diff --git a/src/admin/inc/inc_menu_map.php b/src/admin/inc/inc_menu_map.php index 40b3636d..dd51a38b 100644 --- a/src/admin/inc/inc_menu_map.php +++ b/src/admin/inc/inc_menu_map.php @@ -68,7 +68,7 @@ $menusMain = " - + diff --git a/src/admin/js/mode/xml/index.html b/src/admin/js/mode/xml/index.html index 529a2c29..ecc2c18f 100644 --- a/src/admin/js/mode/xml/index.html +++ b/src/admin/js/mode/xml/index.html @@ -32,7 +32,7 @@ </head> <body> The indentation tries to be <em>somewhat &quot;do what - I mean&quot;</em>... but might not match your style. + I mean&quot;</em> but might not match your style. </body> </html> diff --git a/src/admin/makehtml_archives_action.php b/src/admin/makehtml_archives_action.php index 6e0ba2ac..0be03239 100644 --- a/src/admin/makehtml_archives_action.php +++ b/src/admin/makehtml_archives_action.php @@ -81,7 +81,7 @@ $ttime = number_format(($ttime / 60), 2); $tjlen = $totalnum > 0 ? ceil(($tjnum / $totalnum) * 100) : 100; $dvlen = $tjlen * 2; $tjsta = "
"; -$tjsta .= "
本次用时：".number_format($t2, 2)."，总用时：$ttime 分钟，到达位置：".($startdd + $pagesize)."
完成创建文件总数的：$tjlen %，继续执行任务..."; +$tjsta .= "
本次用时：".number_format($t2, 2)."，总用时：$ttime 分钟，到达位置：".($startdd + $pagesize)."
完成创建文件总数的：$tjlen %，继续执行任务"; if ($tjnum < $totalnum) { $nurl = "makehtml_archives_action.php?endid=$endid&startid=$startid&typeid=$typeid"; $nurl .= "&totalnum=$totalnum&startdd=".($startdd + $pagesize)."&pagesize=$pagesize"; @@ -95,7 +95,7 @@ if ($tjnum < $totalnum) { if ($uptype == '') { ShowMsg("完成所有创建任务，生成文件：$totalnum 总用时：{$ttime} 分钟", "javascript:;"); } else { - ShowMsg("完成文档HTML更新任务，现在开始进行主页更新...", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue"); + ShowMsg("完成文档HTML更新任务，现在开始进行主页更新", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue"); } } } \ No newline at end of file diff --git a/src/admin/makehtml_freelist_action.php b/src/admin/makehtml_freelist_action.php index e0e91781..e12b6531 100644 --- a/src/admin/makehtml_freelist_action.php +++ b/src/admin/makehtml_freelist_action.php @@ -58,7 +58,7 @@ if ($nextpage == $totalpage) { ShowMsg("成功创建列表：".$tid."，继续进行操作", $gourl, 0, 100); } else { $gourl = "makehtml_freelist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$pageno"; - ShowMsg("列表：".$tid."，继续进行操作...", $gourl, 0, 100); + ShowMsg("列表：".$tid."，继续进行操作", $gourl, 0, 100); } } $dsql->ExecuteNoneQuery("Update `#@__freelist` set nodefault='1' where aid='$startid';"); diff --git a/src/admin/makehtml_homepage.php b/src/admin/makehtml_homepage.php index 7234c497..7bcce02c 100644 --- a/src/admin/makehtml_homepage.php +++ b/src/admin/makehtml_homepage.php @@ -78,12 +78,12 @@ if ($dopost == "view") { $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet); $pv->SaveToHtml($homeFile); echo ""; - echo "
成功更新首页：".$homeFile." 浏览...
"; + echo "
成功更新首页：".$homeFile." 浏览
"; } else { //动态浏览 if (file_exists($homeFile)) @unlink($homeFile); echo ""; - echo "
采用动态浏览：浏览...
"; + echo "
采用动态浏览：浏览
"; } $iquery = "UPDATE `#@__homepageset` SET showmod='$showmod'"; $dsql->ExecuteNoneQuery($iquery); diff --git a/src/admin/makehtml_list_action.php b/src/admin/makehtml_list_action.php index b200e93d..cc487b02 100644 --- a/src/admin/makehtml_list_action.php +++ b/src/admin/makehtml_list_action.php @@ -115,7 +115,7 @@ if ($nextpage >= $totalpage && $finishType) { exit(); } else { $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&mkpage=$mkpage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$pageno"; - ShowMsg("栏目：".$tid."，继续进行操作...", $gourl, 0, 100); + ShowMsg("栏目：".$tid."，继续进行操作", $gourl, 0, 100); exit(); } } diff --git a/src/admin/makehtml_map.php b/src/admin/makehtml_map.php index 780aeecb..a11eb143 100644 --- a/src/admin/makehtml_map.php +++ b/src/admin/makehtml_map.php @@ -32,5 +32,5 @@ $dtp->LoadTemplet($tmpfile); $dtp->SaveTo($cfg_basedir.$murl); $dtp->Clear(); echo ""; -echo "
成功更新文件: $murl 浏览...
"; +echo "
成功更新文件: $murl 浏览
"; exit(); diff --git a/src/admin/makehtml_taglist_action.php b/src/admin/makehtml_taglist_action.php index e32c6dc5..ad45b4fe 100644 --- a/src/admin/makehtml_taglist_action.php +++ b/src/admin/makehtml_taglist_action.php @@ -99,7 +99,7 @@ if (is_array($tag) && count($tag) > 0) { } else { //继续当前这个 $gourl = "makehtml_taglist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&tagid=$tagid&pageno=$pageno&upall=$upall&ctagid=$ctagid"; - ShowMsg("成功生成TAG：[".$tag['tag']."]，继续进行操作...", $gourl, 0, 100); + ShowMsg("成功生成TAG：[".$tag['tag']."]，继续进行操作", $gourl, 0, 100); exit(); } } diff --git a/src/admin/module_main.php b/src/admin/module_main.php index 98431418..0e4fa41d 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -269,7 +269,7 @@ else if ($action == 'setupstart') { $rflwft .= ""; echo $rflwft; UpDateCatCache(); - ShowMsg('模块安装完成...', 'module_main.php'); + ShowMsg('模块安装完成', 'module_main.php'); exit(); } } @@ -433,7 +433,7 @@ else if ($action == 'uninstallok') { $rflwft .= "else top.document.getElementById('menufra').src = 'index_menu_module.php';\r\n"; $rflwft .= ""; echo $rflwft; - ShowMsg('模块卸载完成...', 'module_main.php'); + ShowMsg('模块卸载完成', 'module_main.php'); exit(); } } diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php index 423890b1..fcc3b04c 100644 --- a/src/admin/mychannel_edit.php +++ b/src/admin/mychannel_edit.php @@ -270,7 +270,7 @@ else if ($dopost == "copysave") { } $rs = $dsql->ExecuteNoneQuery($inquery); if ($rs) { - ShowMsg("成功复制模型，现转到详细参数页... ", "mychannel_edit.php?id={$newid}&dopost=edit"); + ShowMsg("成功复制模型，现转到详细参数页 ", "mychannel_edit.php?id={$newid}&dopost=edit"); exit(); } else { $errv = $dsql->GetError(); diff --git a/src/admin/stepselect_main.php b/src/admin/stepselect_main.php index 146f55be..d3b99784 100644 --- a/src/admin/stepselect_main.php +++ b/src/admin/stepselect_main.php @@ -174,12 +174,12 @@ else if ($action == 'exarea') { function __addenum_save() { } 关于二级枚举的说明，为了节省查询速度，二级枚举是通过特殊算法生成的，原理为 凡是能被 500 整除的都是一级枚举，(500 * n) + 1 < em < 500 * (n+1) 为下级枚举 -如：1000 的下级枚举对应的值为 1001,1002,1003...1499 +如：1000 的下级枚举对应的值为 1001,1002,10031499 对于 issign=1 的，表示这个类别只有一级枚举，则不受上面的算法限制 ------------------------------------------------------------------------ 更新算法: 新增二级枚举下添加"-N"自己类别选择,例如: -1001二级枚举下面的3级类目,则为1001-1,1001-2... +1001二级枚举下面的3级类目,则为1001-1,1001-2 这时候需要issign=2 ---------------------*/ else if ($action == 'addenum_save') { diff --git a/src/admin/sys_cache_up.php b/src/admin/sys_cache_up.php index a5ea6dcf..c2023772 100644 --- a/src/admin/sys_cache_up.php +++ b/src/admin/sys_cache_up.php @@ -23,7 +23,7 @@ if ($dopost == "ok") { else if ($step == 1) { UpDateCatCache(); ClearOptCache(); - ShowMsg("成功更新栏目缓存，及后台栏目选项,准备更新枚举缓存...", "sys_cache_up.php?dopost=ok&step=2&uparc=$uparc"); + ShowMsg("成功更新栏目缓存，及后台栏目选项,准备更新枚举缓存", "sys_cache_up.php?dopost=ok&step=2&uparc=$uparc"); exit(); } //更新枚举缓存 @@ -31,17 +31,17 @@ if ($dopost == "ok") { include_once(DEDEINC."/enums.func.php"); WriteEnumsCache(); //WriteAreaCache(); 已过期 - ShowMsg("成功更新枚举缓存，准备更新调用缓存...", "sys_cache_up.php?dopost=ok&step=3&uparc=$uparc"); + ShowMsg("成功更新枚举缓存，准备更新调用缓存", "sys_cache_up.php?dopost=ok&step=3&uparc=$uparc"); exit(); } //清理arclist调用缓存、过期会员访问历史、过期短信 else if ($step == 3) { echo ''; $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache`"); - echo "\n成功更新arclist调用缓存，准备清理过期会员访问历史...
"; + echo "\n成功更新arclist调用缓存，准备清理过期会员访问历史
"; $oldtime = time() - (90 * 24 * 3600); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_pms` WHERE sendtime<'$oldtime' "); - echo "成功清理过期短信，准备修正错误文档，这可能要占较长的时间..."; + echo "成功清理过期短信，准备修正错误文档，这可能要占较长的时间"; if ($uparc == 1) { echo ""; } else { @@ -51,7 +51,7 @@ if ($dopost == "ok") { } //修正错误文档 else if ($step == 9) { - ShowMsg('修正错误文档操作已经取消，后台系统：系统错误修复中操作...', 'sys_cache_up.php?dopost=ok&step=-1&uparc=1', 0, 5000); + ShowMsg('修正错误文档操作已经取消，后台系统：系统错误修复中操作', 'sys_cache_up.php?dopost=ok&step=-1&uparc=1', 0, 5000); exit(); } } diff --git a/src/admin/sys_payment.php b/src/admin/sys_payment.php index 38495225..74394156 100644 --- a/src/admin/sys_payment.php +++ b/src/admin/sys_payment.php @@ -27,7 +27,7 @@ $pid = (empty($pid)) ? 0 : intval($pid); [iterm]=>'1:使用标准双接口,使用担保交易接口', //如果含有":",则前面为value值,后面为显示内容 [value]=>'使用担保交易接口', ), - ... + ) 使用方法: 将上述的格式传入到数组中去,然后进行解析: diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php index 96187c0f..15c2bc06 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -112,7 +112,7 @@ else if ($dopost == 2) { } else { $sql = " TRUNCATE TABLE `#@__arctiny`"; $dsql->ExecuteNoneQuery($sql); - $msg .= "两者记录不一致，尝试进行简单修正...
"; + $msg .= "两者记录不一致，尝试进行简单修正
"; //导入普通模型微数据 $sql = "INSERT INTO `#@__arctiny`(id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid) SELECT id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid FROM `#@__archives` "; diff --git a/src/admin/tags_main.php b/src/admin/tags_main.php index e8338d8f..a5b92519 100644 --- a/src/admin/tags_main.php +++ b/src/admin/tags_main.php @@ -146,6 +146,6 @@ else if ($action == 'fetch') { } $start = $start + 100; $goto = "tags_main.php?action=fetch&startaid=$startaid&endaid=$endaid&start=$start"; - ShowMsg('继续获取tags ...', $goto, 0, 500); + ShowMsg('继续获取tags ', $goto, 0, 500); exit(); } diff --git a/src/admin/task_do.php b/src/admin/task_do.php index a466740c..ed805e1a 100644 --- a/src/admin/task_do.php +++ b/src/admin/task_do.php @@ -71,7 +71,7 @@ if ($dopost == 'makeprenext') { exit(); } else { $jumpurl = GetNextUrl(); - ShowMsg("完成下篇文档更新任务 继续执行其它任务...", $jumpurl, 0, 500); + ShowMsg("完成下篇文档更新任务 继续执行其它任务", $jumpurl, 0, 500); exit(); } } @@ -104,7 +104,7 @@ if ($dopost == 'makeindex') { exit(); } else { $jumpurl = GetNextUrl(); - ShowMsg("完成主页更新 现在跳转到其它更新任务...", $jumpurl, 0, 500); + ShowMsg("完成主页更新 现在跳转到其它更新任务", $jumpurl, 0, 500); exit(); } } @@ -145,7 +145,7 @@ else if ($dopost == 'makeparenttype') { if (!empty($doposttmp)) { $jumpurl = preg_replace("#doposttmp|nextdotmp#", 'del', $jumpurl); $jumpurl .= "&dopost={$doposttmp}&nextdo={$nextdotmp}"; - ShowMsg("完成栏目:{$tid} 更新
完成栏目更新任务，继续执行后续任务...", $jumpurl, 0, 500); + ShowMsg("完成栏目:{$tid} 更新
完成栏目更新任务，继续执行后续任务", $jumpurl, 0, 500); exit(); } else { ShowMsg("完成栏目:{$tid} 更新
完成栏目更新任务，完成所有更新任务", "close::tgtable"); @@ -154,7 +154,7 @@ else if ($dopost == 'makeparenttype') { } else { $curpage++; $jumpurl .= "&curpage={$curpage}&dopost=makeparenttype"; - ShowMsg("完成栏目:{$tid} 更新，继续更新其它栏目...", $jumpurl, 0, 500); + ShowMsg("完成栏目:{$tid} 更新，继续更新其它栏目", $jumpurl, 0, 500); exit(); } } diff --git a/src/admin/templets/ad_add.htm b/src/admin/templets/ad_add.htm index bdb26e88..141e5968 100644 --- a/src/admin/templets/ad_add.htm +++ b/src/admin/templets/ad_add.htm @@ -96,7 +96,7 @@ diff --git a/src/admin/templets/ad_edit.htm b/src/admin/templets/ad_edit.htm index 3b7bb427..1ef493b6 100644 --- a/src/admin/templets/ad_edit.htm +++ b/src/admin/templets/ad_edit.htm @@ -62,7 +62,7 @@ @@ -307,7 +307,7 @@ table{border-collapse:separate} 把图片从别的网页复制，在这里用Ctrl+V粘贴，提交后程序可直接获取这个区域的所有图片
-
粘贴到这里...
+
粘贴到这里
广告分类：
广告分类：
请选择分类： \r\n"; - echo "\r\n"; + echo "\r\n"; echo $typeOptions; echo ""; ?> @@ -291,7 +291,7 @@ table{border-collapse:separate}
 压缩包文件： - +
@@ -454,7 +454,7 @@ table{border-collapse:separate} - +
 关键字：
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index 226caea5..ac5e27dc 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -180,7 +180,7 @@ table{border-collapse:separate} getUserChannel(),$channelid); echo "'; ?> @@ -416,7 +416,7 @@ if($cfg_need_typeid2=='Y') {  压缩包文件： - + @@ -433,7 +433,7 @@ if($cfg_need_typeid2=='Y') {
把图片从别的网页复制，在这里用Ctrl+V粘贴，提交后程序可直接获取这个区域的所有图片
-
粘贴到这里...
+
粘贴到这里
diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index 587b1577..9a620527 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -169,7 +169,7 @@ table{border-collapse:separate} getUserChannel(),$channelid); echo ""; ?> @@ -333,7 +333,7 @@ table{border-collapse:separate}
- + diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm index d24dbf41..90fe383a 100644 --- a/src/admin/templets/archives_edit.htm +++ b/src/admin/templets/archives_edit.htm @@ -165,7 +165,7 @@ table{border-collapse:separate} getUserChannel(),$channelid); echo ""; ?> diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm index 4a2ba546..e4b47736 100644 --- a/src/admin/templets/archives_sg_add.htm +++ b/src/admin/templets/archives_sg_add.htm @@ -154,7 +154,7 @@ table{border-collapse:separate} getUserChannel(),$channelid); echo ""; ?> diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm index e74cba11..b01257b0 100644 --- a/src/admin/templets/archives_sg_edit.htm +++ b/src/admin/templets/archives_sg_edit.htm @@ -144,7 +144,7 @@ table{border-collapse:separate} getUserChannel(),$channelid); echo ""; ?> diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index 7c7a0ec9..6722668e 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -229,7 +229,7 @@ table{border-collapse:separate}  关键字： - +
diff --git a/src/admin/templets/article_coonepage_rule.htm b/src/admin/templets/article_coonepage_rule.htm index ada85e77..8f2e43f4 100644 --- a/src/admin/templets/article_coonepage_rule.htm +++ b/src/admin/templets/article_coonepage_rule.htm @@ -23,7 +23,7 @@ //编辑 function EditNode(nid) { $DE('editNode').style.display = 'block'; - var myajax = new DedeAjax($DE('editNodeBody'), false, true, "", "", "请稍候，正在载入..."); + var myajax = new DedeAjax($DE('editNodeBody'), false, true, "", "", "请稍候，正在载入"); myajax.SendGet2('article_coonepage_rule.php?action=editload&id=' + nid); DedeXHTTP = null; } @@ -145,7 +145,7 @@
- 请稍候，正在载入... + 请稍候，正在载入
diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index a03b5b1a..f623bb95 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -242,14 +242,14 @@ function CheckCross() { 栏目大图： - + 栏目小图： - + @@ -430,7 +430,7 @@ function CheckCross() { 封面模板： - + 帮助 @@ -438,14 +438,14 @@ function CheckCross() { 列表模板： - + 文章模板： - + diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm index 24187907..9dbde617 100644 --- a/src/admin/templets/catalog_add_quick.htm +++ b/src/admin/templets/catalog_add_quick.htm @@ -156,7 +156,7 @@ 隶属栏目： （默认为顶级栏目） @@ -227,7 +227,7 @@ 排序 顶级栏目名称 - 子栏目(用"目录名称1,目录名称2..."这样表示多个栏目) + 子栏目(用"目录名称1,目录名称2"这样表示多个栏目) diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index ac4afeb0..b3dea551 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -215,14 +215,14 @@ function CheckCross() { 栏目大图： - + 栏目小图： - + @@ -354,7 +354,7 @@ function CheckCross() { 封面模板： - + 帮助 @@ -362,14 +362,14 @@ function CheckCross() { 列表模板： - + 文章模板： - + diff --git a/src/admin/templets/catalog_main.htm b/src/admin/templets/catalog_main.htm index 0fc0d298..b17b8527 100644 --- a/src/admin/templets/catalog_main.htm +++ b/src/admin/templets/catalog_main.htm @@ -156,7 +156,7 @@ $tu->ListAllType($userChannel,$opendir); - + diff --git a/src/admin/templets/catalog_menu.htm b/src/admin/templets/catalog_menu.htm index 15d66ef1..66a168c5 100644 --- a/src/admin/templets/catalog_menu.htm +++ b/src/admin/templets/catalog_menu.htm @@ -11,7 +11,7 @@ function LoadSuns(ctid,tid) { if($DE(ctid).innerHTML.length < 10){ - var myajax = new DedeAjax($DE(ctid),true,true,'','x','...'); + var myajax = new DedeAjax($DE(ctid),true,true,'','x',''); myajax.SendGet('catalog_do.php?dopost=GetSunListsMenu&cid='+tid); } else { if(document.all) showHide(ctid); } } diff --git a/src/admin/templets/catalog_menu2.htm b/src/admin/templets/catalog_menu2.htm index 35d739bf..99be8428 100644 --- a/src/admin/templets/catalog_menu2.htm +++ b/src/admin/templets/catalog_menu2.htm @@ -13,7 +13,7 @@ function LoadSuns(ctid,tid) { if($DE(ctid).innerHTML.length < 10){ - var myajax = new DedeAjax($DE(ctid),true,true,'','x','...'); + var myajax = new DedeAjax($DE(ctid),true,true,'','x',''); myajax.SendGet('catalog_do.php?dopost=GetSunListsMenu&cid='+tid); } else{ if(document.all) showHide(ctid); } diff --git a/src/admin/templets/content_batch_up.htm b/src/admin/templets/content_batch_up.htm index 22eaba40..5595f787 100644 --- a/src/admin/templets/content_batch_up.htm +++ b/src/admin/templets/content_batch_up.htm @@ -75,7 +75,7 @@ $tl = new TypeLink(0); $typeOptions = $tl->GetOptionArray(0,$admin_catalogs,0,1); echo ""; ?> diff --git a/src/admin/templets/content_i_list.htm b/src/admin/templets/content_i_list.htm index 20f0310d..41f2bf91 100644 --- a/src/admin/templets/content_i_list.htm +++ b/src/admin/templets/content_i_list.htm @@ -133,7 +133,7 @@ 请选择类目： @@ -145,7 +145,7 @@ - + diff --git a/src/admin/templets/content_select_list.htm b/src/admin/templets/content_select_list.htm index 05882043..6ba1dc9d 100644 --- a/src/admin/templets/content_select_list.htm +++ b/src/admin/templets/content_select_list.htm @@ -109,7 +109,7 @@ 请选择类目： diff --git a/src/admin/templets/content_sg_list.htm b/src/admin/templets/content_sg_list.htm index 1ea5e61e..7278fae1 100644 --- a/src/admin/templets/content_sg_list.htm +++ b/src/admin/templets/content_sg_list.htm @@ -281,7 +281,7 @@ 请选择类目： diff --git a/src/admin/templets/freelist_add.htm b/src/admin/templets/freelist_add.htm index ecdac211..f770c877 100644 --- a/src/admin/templets/freelist_add.htm +++ b/src/admin/templets/freelist_add.htm @@ -65,7 +65,7 @@
- [field:description/]... + [field:description/]
@@ -118,7 +118,7 @@ 列表模板： + onClick="SelectTemplets('form1.templet');" class="btn btn-success btn-sm">浏览 最大列出页数： @@ -174,7 +174,7 @@ 限定栏目： \r\n"; - echo "\r\n"; + echo "\r\n"; $dsql->SetQuery("Select ID,typename, channeltype From #@__arctype"); $dsql->Execute(); while($lrow = $dsql->GetObject()){ @@ -192,7 +192,7 @@ 限定频道： \r\n"; - echo "\r\n"; + echo "\r\n"; $dsql->SetQuery("Select ID,typename From #@__channeltype where ID>0"); $dsql->Execute(); while($row = $dsql->GetObject()) @@ -207,7 +207,7 @@ 附加属性： \r\n"; - echo "\r\n"; + echo "\r\n"; $dsql->SetQuery("Select * From #@__arcatt"); $dsql->Execute(); while($row = $dsql->GetObject()) diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm index c4898d5a..12e3b3b5 100644 --- a/src/admin/templets/freelist_edit.htm +++ b/src/admin/templets/freelist_edit.htm @@ -111,7 +111,7 @@ 列表模板： + onClick="SelectTemplets('form1.templet');" class="btn btn-success btn-sm">浏览 最大列出页数： @@ -147,7 +147,7 @@ GetAtt('typeid'); echo "\r\n"; - echo "\r\n"; + echo "\r\n"; $dsql->SetQuery("Select * From #@__arcatt"); $dsql->Execute(); while($nrow = $dsql->GetObject()) diff --git a/src/admin/templets/freelist_main.htm b/src/admin/templets/freelist_main.htm index 55a14c41..769cc637 100644 --- a/src/admin/templets/freelist_main.htm +++ b/src/admin/templets/freelist_main.htm @@ -20,7 +20,7 @@ orderby = ordertype; var listArea = $Obj('rslist'); var errMsg = "网络通信出错
[点击此重新加载列表]"; - var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在加载..."); + var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在加载"); myajax.SendGet("freelist_main.php?dopost=getlist&pageno=" + pageno + "&orderby=" + ordertype + addget); } //载入指定页的列表 @@ -45,7 +45,7 @@ var pagenum = Math.ceil(totalrow / pagesize); if (pagenum <= pageno) pageno = pagenum; var errMsg = "网络通信出错
[点击此重新加载列表]"; - var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在处理..."); + var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在处理"); myajax.SendGet("freelist_main.php?dopost=del&aid=" + nid + "&pageno=" + pageno); ReloadPageNum(pageno); } diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm index bcc6da43..d1efcc05 100644 --- a/src/admin/templets/index_body.htm +++ b/src/admin/templets/index_body.htm @@ -55,7 +55,7 @@ $(function () {
版本授权
-
正在载入中...
+
正在载入中
@@ -167,7 +167,7 @@ $(function () {
信息统计
-
正在载入中...
+
正在载入中
@@ -220,10 +220,10 @@ $(function () {
- 请稍候，正在载入... + 请稍候，正在载入
diff --git a/src/admin/templets/makehtml_archives.htm b/src/admin/templets/makehtml_archives.htm index 2ce74603..2e14a0d7 100644 --- a/src/admin/templets/makehtml_archives.htm +++ b/src/admin/templets/makehtml_archives.htm @@ -17,9 +17,9 @@ - +
更新文档HTML：更新文档H： - 更新栏目HTML + 更新栏目
@@ -33,7 +33,7 @@ $tl = new TypeLink($cid); $typeOptions = $tl->GetOptionArray($cid,$admin_catalogs,0); echo ""; ?> diff --git a/src/admin/templets/makehtml_homepage.htm b/src/admin/templets/makehtml_homepage.htm index e8093abb..03b74762 100644 --- a/src/admin/templets/makehtml_homepage.htm +++ b/src/admin/templets/makehtml_homepage.htm @@ -37,7 +37,7 @@ 选择首页模板： - + diff --git a/src/admin/templets/makehtml_js.htm b/src/admin/templets/makehtml_js.htm index 10bc377f..b65ae19a 100644 --- a/src/admin/templets/makehtml_js.htm +++ b/src/admin/templets/makehtml_js.htm @@ -26,7 +26,7 @@ - + @@ -41,7 +41,7 @@ $tl = new TypeLink($cid); $typeOptions = $tl->GetOptionArray($cid,$admin_catalogs,0,1); echo ""; ?> @@ -59,7 +59,7 @@ diff --git a/src/admin/templets/makehtml_list.htm b/src/admin/templets/makehtml_list.htm index dc01b940..2f132555 100644 --- a/src/admin/templets/makehtml_list.htm +++ b/src/admin/templets/makehtml_list.htm @@ -2,7 +2,7 @@ - 更新栏目HTML + 更新栏目 @@ -14,9 +14,9 @@
获取栏目JS文件：更新脚本： 栏目管理
模板文件： - +
- + @@ -31,7 +31,7 @@ $tl = new TypeLink($cid); $typeOptions = $tl->GetOptionArray($cid,$admin_catalogs,0,1); echo ""; ?> diff --git a/src/admin/templets/makehtml_rss.htm b/src/admin/templets/makehtml_rss.htm index d4e40624..9dfde817 100644 --- a/src/admin/templets/makehtml_rss.htm +++ b/src/admin/templets/makehtml_rss.htm @@ -2,7 +2,7 @@ - 更新RSS文件 + 更新订阅 @@ -14,7 +14,7 @@ diff --git a/src/admin/templets/sys_data_replace.htm b/src/admin/templets/sys_data_replace.htm index 7964bc3f..68fe6ccf 100644 --- a/src/admin/templets/sys_data_replace.htm +++ b/src/admin/templets/sys_data_replace.htm @@ -11,7 +11,7 @@ function ShowFields() { var exptable = $DE('exptable').options[$DE('exptable').selectedIndex].value; var queryUrl = "sys_data_replace.php?exptable=" + exptable + "&action=getfields"; - var myajax = new DedeAjax($DE('fields'), true, true, '', 'x', '...'); + var myajax = new DedeAjax($DE('fields'), true, true, '', 'x', ''); myajax.SendGet(queryUrl); } function CheckSubmit() { diff --git a/src/admin/templets/sys_data_revert.htm b/src/admin/templets/sys_data_revert.htm index 0f0dad34..999fd715 100644 --- a/src/admin/templets/sys_data_revert.htm +++ b/src/admin/templets/sys_data_revert.htm @@ -74,7 +74,7 @@
diff --git a/src/admin/templets/tag_test.htm b/src/admin/templets/tag_test.htm index c6ca16df..6724986c 100644 --- a/src/admin/templets/tag_test.htm +++ b/src/admin/templets/tag_test.htm @@ -63,7 +63,7 @@ $tl = new TypeLink($cid); $typeOptions = $tl->GetOptionArray($cid,$admin_catalogs,0); echo ""; ?> diff --git a/src/include/arc.archives.class.php b/src/include/arc.archives.class.php index aa55de94..23355ae6 100755 --- a/src/include/arc.archives.class.php +++ b/src/include/arc.archives.class.php @@ -500,7 +500,7 @@ class Archives if ($GLOBALS['cfg_jump_once'] == 'N') { $pageHtml = "\r\n\r\n\r\n".$this->Fields['title']."\r\n"; $pageHtml .= "Fields['redirecturl']."\">\r\n\r\n\r\n"; - $pageHtml .= "现在正在转向：".$this->Fields['title']."，请稍候...

\r\n转向内容简介：".$this->Fields['description']."\r\n\r\n\r\n"; + $pageHtml .= "现在正在转向：".$this->Fields['title']."，请稍候

\r\n转向内容简介：".$this->Fields['description']."\r\n\r\n\r\n"; echo $pageHtml; } else { header("location:{$this->Fields['redirecturl']}"); diff --git a/src/include/cli.class.php b/src/include/cli.class.php index 1c75a661..25a392da 100644 --- a/src/include/cli.class.php +++ b/src/include/cli.class.php @@ -21,7 +21,7 @@ class DedeCli { public static $readline_support = false; protected static $initialized = false; - protected static $wait_msg = "Press any key to continue..."; + protected static $wait_msg = "Press any key to continue"; protected static $segments = []; protected static $options = []; @@ -355,7 +355,7 @@ class DedeCli $time = $seconds; while ($time > 0) { - fwrite(STDOUT, $time.'... '); + fwrite(STDOUT, $time.' '); sleep(1); $time--; } diff --git a/src/include/common.func.php b/src/include/common.func.php index 94fbb15c..435dba8d 100755 --- a/src/include/common.func.php +++ b/src/include/common.func.php @@ -93,7 +93,7 @@ function dede_random_bytes($length) * { * function HelloDede() * { - * echo "Hello! Dede..."; + * echo "Hello! Dede"; * } * } * diff --git a/src/include/customfields.func.php b/src/include/customfields.func.php index b423b738..f1842aa0 100755 --- a/src/include/customfields.func.php +++ b/src/include/customfields.func.php @@ -101,19 +101,19 @@ function GetFormItem($ctag, $admintype = 'admin') if ($admintype == 'diy') { $innertext = "\r\n"; } else { - $innertext = " \r\n"; + $innertext = " \r\n"; } } else if ($fieldType == 'media') { if ($admintype == 'diy') { $innertext = "不支持的类型\r\n"; } else { - $innertext = " \r\n"; + $innertext = " \r\n"; } } else if ($fieldType == 'addon') { if ($admintype == 'diy') { $innertext = "\r\n"; } else { - $innertext = " \r\n"; + $innertext = " \r\n"; } } else if ($fieldType == 'int' || $fieldType == 'float') { $dfvalue = ($ctag->GetAtt('default') != '' ? $ctag->GetAtt('default') : '0'); @@ -403,13 +403,13 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '') $ntag = $ndtp->GetTag("img"); $fvalue = trim($ntag->GetInnerText()); } - $innertext = " \r\n"; + $innertext = " \r\n"; } else if ($ftype == "imgfile") { - $innertext = " \r\n"; + $innertext = " \r\n"; } else if ($ftype == "media") { - $innertext = " \r\n"; + $innertext = " \r\n"; } else if ($ftype == "addon") { - $innertext = " \r\n"; + $innertext = " \r\n"; } else if ($ftype == "int" || $ftype == "float") { $innertext = " (填写数值)\r\n"; } else if ($ftype == "relation") { diff --git a/src/include/dedetag.class.php b/src/include/dedetag.class.php index 04bb55e1..3804e6d7 100755 --- a/src/include/dedetag.class.php +++ b/src/include/dedetag.class.php @@ -210,7 +210,7 @@ class DedeTagParse foreach ($tokens as $token) { if (is_array($token)) { if ($token[0] = '306' && in_array($token[1], $disabled_functions)) { - $errmsg = 'DedeBIZ Error:function disabled "'.$token[1].'" more...'; + $errmsg = 'DedeBIZ Error:function disabled "'.$token[1].'" more'; return FALSE; } } diff --git a/src/include/dedetemplate.class.php b/src/include/dedetemplate.class.php index c8584d19..abc4d3f3 100755 --- a/src/include/dedetemplate.class.php +++ b/src/include/dedetemplate.class.php @@ -446,7 +446,7 @@ class DedeTemplate foreach ($tokens as $token) { if (is_array($token)) { if ($token[0] = '306' && in_array($token[1], $disabled_functions)) { - $errmsg = 'DedeBIZ Error:function disabled "'.$token[1].'" more...'; + $errmsg = 'DedeBIZ Error:function disabled "'.$token[1].'" more'; return FALSE; } } diff --git a/src/include/helpers/channelunit.helper.php b/src/include/helpers/channelunit.helper.php index 9274e6a2..d142bb24 100755 --- a/src/include/helpers/channelunit.helper.php +++ b/src/include/helpers/channelunit.helper.php @@ -488,7 +488,7 @@ function MakeOneTag(&$dtp, &$refObj, $parfield = 'Y') } if (in_array($tagname, $alltags)) { if (in_array($tagname, $disable_tags)) { - if (DEBUG_LEVEL) echo 'DedeBIZ Error:Tag disabled:"'.$tagname.'" more...!'; + if (DEBUG_LEVEL) echo 'DedeBIZ Error:Tag disabled:"'.$tagname.'" more!'; continue; } if (DEBUG_LEVEL == TRUE) { diff --git a/src/include/helpers/test.helper.php b/src/include/helpers/test.helper.php index 12adef00..31ade26f 100755 --- a/src/include/helpers/test.helper.php +++ b/src/include/helpers/test.helper.php @@ -13,6 +13,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); if (!function_exists('HelloDede')) { function HelloDede() { - echo "Hello! Dede..."; + echo "Hello! Dede"; } } diff --git a/src/include/qrcode/phpqrcode.php b/src/include/qrcode/phpqrcode.php index ac7eaf13..4499fa9d 100755 --- a/src/include/qrcode/phpqrcode.php +++ b/src/include/qrcode/phpqrcode.php @@ -790,7 +790,7 @@ } } - //and a little bit... + //and a little bit $frame[$width - 8][8] = "\x81"; return $frame; diff --git a/src/include/qrcode/qrspec.php b/src/include/qrcode/qrspec.php index 6077b781..b84e83de 100755 --- a/src/include/qrcode/qrspec.php +++ b/src/include/qrcode/qrspec.php @@ -478,7 +478,7 @@ } } - //and a little bit... + //and a little bit $frame[$width - 8][8] = "\x81"; return $frame; diff --git a/src/include/splitword.class.php b/src/include/splitword.class.php index 6b052b36..23331392 100755 --- a/src/include/splitword.class.php +++ b/src/include/splitword.class.php @@ -971,7 +971,7 @@ class SplitWord /** * 获取索引hash数组 - * @return array('word'=>count,...) + * @return array('word'=>count,) */ function GetFinallyIndex() { diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index f7d96336..e8ccefe8 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -527,7 +527,7 @@ INSERT INTO `#@__flinktype` VALUES('1','综合网站'), ('7','论坛类'), ('8','其它类型'); -INSERT INTO `#@__freelist` VALUES('1','测试内容','{listdir}/index_{listid}_{page}.html','{cmspath}/freelist/','index.html','1','{style}/list_free.htm','1289712633','100','0','{dede:list pagesize="30" col="1" titlelen="60" orderby="pubdate" orderway="desc" typeid="1" channel="1" }
  • [field:imglink/] [field:textlink/] 日期：[field:pubdate function="getdatemk(@me)"/] 点击：[field:click/] 好评：[field:scores/] \t\n

    [field:description/]...

    • {/dede:list}','阿三大厦大大','阿三大厦大厦大撒'), +INSERT INTO `#@__freelist` VALUES('1','测试内容','{listdir}/index_{listid}_{page}.html','{cmspath}/freelist/','index.html','1','{style}/list_free.htm','1289712633','100','0','{dede:list pagesize="30" col="1" titlelen="60" orderby="pubdate" orderway="desc" typeid="1" channel="1" }
  • [field:imglink/] [field:textlink/] 日期：[field:pubdate function="getdatemk(@me)"/] 点击：[field:click/] 好评：[field:scores/] \t\n

    [field:description/]

    • {/dede:list}','阿三大厦大大','阿三大厦大厦大撒'), ('10','Google SiteMap 生成器','{listdir}googlemap_{page}.xml','{cmspath}','index.html','1','{style}/googlemap.htm','1226884666','100','0','{dede:list pagesize="500" col="1" titlelen="60" orderby="pubdate" orderway="desc" \t\n channel="1" keyword="" }\t\n [field:arcurl function="Gmapurl(@me)"/] \t\n [field:title function="HtmlReplace(@me)"/]\t\n \t\n [field:keywords/]\t\n [field:senddate function="strftime('%Y-%m-%d',@me)"/]\t\n \t\n{/dede:list}','',''); INSERT INTO `#@__member_type` VALUES('1','50','中级会员半年','100','7'); diff --git a/src/member/config.php b/src/member/config.php index 2476ee7e..a6d86c54 100755 --- a/src/member/config.php +++ b/src/member/config.php @@ -175,7 +175,7 @@ function CheckRank($rank = 0, $money = 0) ShowMsg("邮箱地址为空，请设置一个可用的邮箱地址", "edit_email.php", 0, 5000); exit; } - $msg = "您尚未进行邮件验证，请到邮箱查阅...
    重新发送邮件验证 点击此处"; + $msg = "您尚未进行邮件验证，请到邮箱查阅
    重新发送邮件验证 点击此处"; ShowMsg($msg, "-1", 0, 5000); exit; } diff --git a/src/member/index_do.php b/src/member/index_do.php index 086c2e2d..981900c1 100755 --- a/src/member/index_do.php +++ b/src/member/index_do.php @@ -220,10 +220,10 @@ else if ($fmdo == 'login') { //清除会员缓存 $cfg_ml->DelCache($cfg_ml->M_ID); if (empty($gourl) || preg_match("#action|_do#i", $gourl)) { - ShowMsg("成功登录，5秒钟后转向系统主页...", "index.php", 0, 2000); + ShowMsg("成功登录，5秒钟后转向系统主页", "index.php", 0, 2000); } else { $gourl = str_replace('^', '&', $gourl); - ShowMsg("成功登录，现在转向指定页面...", $gourl, 0, 2000); + ShowMsg("成功登录，现在转向指定页面", $gourl, 0, 2000); } exit(); } diff --git a/src/member/templets/album_add.htm b/src/member/templets/album_add.htm index 73479a20..4c27d58f 100755 --- a/src/member/templets/album_add.htm +++ b/src/member/templets/album_add.htm @@ -61,7 +61,7 @@ \r\n"; - echo "\r\n"; + echo "\r\n"; echo $typeOptions; echo ""; ?> diff --git a/src/member/templets/archives_add.htm b/src/member/templets/archives_add.htm index 24dcea04..ab00724a 100755 --- a/src/member/templets/archives_add.htm +++ b/src/member/templets/archives_add.htm @@ -59,7 +59,7 @@ \r\n"; - echo "\r\n"; + echo "\r\n"; echo $typeOptions; echo ""; ?> diff --git a/src/member/templets/archives_sg_add.htm b/src/member/templets/archives_sg_add.htm index 2b339322..f258bea0 100755 --- a/src/member/templets/archives_sg_add.htm +++ b/src/member/templets/archives_sg_add.htm @@ -59,7 +59,7 @@ \r\n"; - echo "\r\n"; + echo "\r\n"; echo $typeOptions; echo ""; ?> diff --git a/src/member/templets/article_add.htm b/src/member/templets/article_add.htm index db336c9b..a99f14f6 100755 --- a/src/member/templets/article_add.htm +++ b/src/member/templets/article_add.htm @@ -59,7 +59,7 @@ \r\n"; - echo "\r\n"; + echo "\r\n"; echo $typeOptions; echo ""; ?> diff --git a/src/member/templets/soft_add.htm b/src/member/templets/soft_add.htm index 9f72428a..47254e18 100755 --- a/src/member/templets/soft_add.htm +++ b/src/member/templets/soft_add.htm @@ -81,7 +81,7 @@ \r\n"; - echo "\r\n"; + echo "\r\n"; echo $typeOptions; echo ""; ?> diff --git a/src/templets/plus/list_diyform.htm b/src/templets/plus/list_diyform.htm index a4bd5f12..0dab809e 100755 --- a/src/templets/plus/list_diyform.htm +++ b/src/templets/plus/list_diyform.htm @@ -36,7 +36,7 @@ { echo '
    '; echo ''; - echo ''; + echo ''; foreach($fieldlist as $field=>$fielddata) { if($fields[$field]=='') continue; @@ -54,7 +54,7 @@ else $fields[$field] = dede_htmlspecialchars($fields[$field]); if( strlen($fields[$field]) > 250 ) { - $fields[$field] = cn_substr( $fields[$field], 250).'...'; + $fields[$field] = cn_substr( $fields[$field], 250).''; } } echo "\r\n"; diff --git a/src/templets/system/list_fulllist.htm b/src/templets/system/list_fulllist.htm index c67f0f94..4af48b0e 100755 --- a/src/templets/system/list_fulllist.htm +++ b/src/templets/system/list_fulllist.htm @@ -1,7 +1,7 @@
    ·[field:title/]
    -     [field:description/]... +     [field:description/]
    日期：[field:pubdate function="GetDateTimeMK(@me)"/] 点击：[field:click/] 好评度：[field:scores/] diff --git a/src/templets/system/part_autochannel.htm b/src/templets/system/part_autochannel.htm index 18feac7d..51b57e42 100755 --- a/src/templets/system/part_autochannel.htm +++ b/src/templets/system/part_autochannel.htm @@ -6,6 +6,6 @@ [field:typename/]
  • - 更多... + 更多
    • \ No newline at end of file diff --git a/src/templets/system/part_channelartlist.htm b/src/templets/system/part_channelartlist.htm index 712169d7..f617a6d9 100755 --- a/src/templets/system/part_channelartlist.htm +++ b/src/templets/system/part_channelartlist.htm @@ -9,7 +9,7 @@ [field:typename /]
    更新栏目HTML：更新栏目： - 更新文档HTML + 更新文档H 栏目管理
    - +
    更新RSS文件：更新订阅：
    diff --git a/src/admin/templets/makehtml_spec.htm b/src/admin/templets/makehtml_spec.htm index 652d2879..2fa8b875 100644 --- a/src/admin/templets/makehtml_spec.htm +++ b/src/admin/templets/makehtml_spec.htm @@ -2,7 +2,7 @@ - 生成专题列表 + 更新专题 @@ -15,7 +15,7 @@     		- +
    生成专题列表：更新专题：  
    diff --git a/src/admin/templets/makehtml_taglist.htm b/src/admin/templets/makehtml_taglist.htm index 5fe49c83..1685ddf9 100644 --- a/src/admin/templets/makehtml_taglist.htm +++ b/src/admin/templets/makehtml_taglist.htm @@ -30,7 +30,7 @@ $sql="select * from #@__tagindex where total > {$dd['tt']} order by tag asc"; $dsql->Execute('al',$sql); echo "
    发现的备份文件： - +
    id
    '.$fields['id'].'
    详细...  
    '.$fields['id'].'
    详细  
    {$fielddata[0]}{$fields[$field]}
    - 更多... + 更多