diff --git a/src/dede/ad_add.php b/src/dede/ad_add.php index 9299e614..5ef1b645 100755 --- a/src/dede/ad_add.php +++ b/src/dede/ad_add.php @@ -21,7 +21,7 @@ if ($dopost == "save") { $tagname = trim($tagname); $row = $dsql->GetOne("SELECT typeid FROM #@__myad WHERE typeid='$typeid' AND tagname LIKE '$tagname'"); if (is_array($row)) { - ShowMsg("在相同栏目下已经存在同名的标记!", "-1"); + ShowMsg("在相同栏目下已经存在同名的标记", "-1"); exit(); } $starttime = GetMkTime($starttime); @@ -62,7 +62,7 @@ if ($dopost == "save") { VALUES('$clsid','$typeid','$tagname','$adname','$timeset','$starttime','$endtime','$normbody','$expbody'); "; $dsql->ExecuteNoneQuery($query); - ShowMsg("成功增加一个广告!", "ad_main.php"); + ShowMsg("成功增加一个广告", "ad_main.php"); exit(); } $dsql->Execute('dd', 'SELECT * FROM `#@__myadtype` ORDER BY id DESC'); diff --git a/src/dede/ad_edit.php b/src/dede/ad_edit.php index 0dc4a265..53283678 100755 --- a/src/dede/ad_edit.php +++ b/src/dede/ad_edit.php @@ -18,7 +18,7 @@ $ENV_GOBACK_URL = empty($_COOKIE['ENV_GOBACK_URL']) ? "ad_main.php" : $_COOKIE[' if ($dopost == 'delete') { $dsql->ExecuteNoneQuery("DELETE FROM `#@__myad` WHERE aid='$aid' "); - ShowMsg("成功删除一则广告代码!", $ENV_GOBACK_URL); + ShowMsg("成功删除一则广告代码", $ENV_GOBACK_URL); exit(); } else if ($dopost == "gettag") { require_once(DEDEINC.'/oxwindow.class.php'); @@ -32,7 +32,7 @@ if ($dopost == 'delete') { 如果不希望重新生成所有页面,则直接调用JS代码即可。 "; $wintitle = "广告管理-获取广告标签"; - $wecome_info = "广告管理::获取JS"; + $wecome_info = "广告管理::获取JS"; $win = new OxWindow(); $win->Init(); $winform = $win->GetWindow("hand", $info); @@ -63,7 +63,7 @@ if ($dopost == 'delete') { WHERE aid='$aid' "; $dsql->ExecuteNoneQuery($query); - ShowMsg("成功更改一则广告代码!", $ENV_GOBACK_URL); + ShowMsg("成功更改一则广告代码", $ENV_GOBACK_URL); exit(); } diff --git a/src/dede/adtype_main.php b/src/dede/adtype_main.php index 947d46f6..9f954447 100755 --- a/src/dede/adtype_main.php +++ b/src/dede/adtype_main.php @@ -36,7 +36,7 @@ if ($dopost == "save") { $dsql->ExecuteNoneQuery($query); } header("Content-Type: text/html; charset={$cfg_soft_lang}"); - ShowMsg("成功更新广告分类列表!", 'adtype_main.php'); + ShowMsg("成功更新广告分类列表", 'adtype_main.php'); exit; } diff --git a/src/dede/article_coonepage_rule.php b/src/dede/article_coonepage_rule.php index 40de3a77..7911ea96 100755 --- a/src/dede/article_coonepage_rule.php +++ b/src/dede/article_coonepage_rule.php @@ -20,7 +20,7 @@ function _AddNote(){ } if ($action == 'add') { $row = $dsql->GetOne("SELECT * FROM `#@__co_onepage` WHERE url LIKE '$url' "); if (is_array($row)) { - echo "系统已经存在这个网址的条目!"; + echo "系统已经存在这个网址的条目"; } else { $query = " INSERT INTO `#@__co_onepage`(`url`,`title`,`issource`,`lang`,`rule`) Values('$url','$title','$issource','$lang','$rule'); "; $dsql->ExecuteNonequery($query); diff --git a/src/dede/article_keywords_select.php b/src/dede/article_keywords_select.php index 0588d768..fb7dd78b 100755 --- a/src/dede/article_keywords_select.php +++ b/src/dede/article_keywords_select.php @@ -33,6 +33,6 @@ function GetSta($sta) function GetMan($sta) { - if ($sta == 1) return "禁用"; - else return "启用"; + if ($sta == 1) return "禁用"; + else return "启用"; } diff --git a/src/dede/article_template_rand.php b/src/dede/article_template_rand.php index 510e90e9..31f33e7e 100755 --- a/src/dede/article_template_rand.php +++ b/src/dede/article_template_rand.php @@ -33,19 +33,19 @@ else if ($dopost == 'makeold') { set_time_limit(3600); if (!file_exists($m_file)) { AjaxHead(); - echo "配置文件不存在!"; + echo "配置文件不存在"; exit(); } require_once($m_file); if ($cfg_tamplate_rand == 0) { AjaxHead(); - echo "系统没开启允许随机模板的选项!"; + echo "系统没开启允许随机模板的选项"; exit(); } $totalTmp = count($cfg_tamplate_arr) - 1; if ($totalTmp < 1) { AjaxHead(); - echo "随机模板的数量必须为2个或以上!"; + echo "随机模板的数量必须为2个或以上"; exit(); } for ($i = 0; $i < 10; $i++) { @@ -53,7 +53,7 @@ else if ($dopost == 'makeold') { $dsql->ExecuteNoneQuery(" Update `#@__addonarticle` set templet='$temp' where RIGHT(aid, 1)='$i' "); } AjaxHead(); - echo "全部随机操作成功!"; + echo "全部随机操作成功"; exit(); } //清除全部的指定模板 @@ -62,7 +62,7 @@ else if ($dopost == 'clearold') { $dsql->ExecuteNoneQuery(" Update `#@__addonarticle` set templet='' "); $dsql->ExecuteNoneQuery(" OPTIMIZE TABLE `#@__addonarticle` "); AjaxHead(); - echo "全部清除操作成功!"; + echo "全部清除操作成功"; exit(); } @@ -96,8 +96,8 @@ function DoRand(jobname) - + $line = "\n\r\n"; @@ -130,7 +130,7 @@ table{background:#fff} } else if (is_dir("$inpath/$file")) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; - $line = "\n + $line = "\n @@ -142,7 +142,7 @@ table{background:#fff} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - $line = "\n + $line = "\n @@ -154,7 +154,7 @@ table{background:#fff} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - $line = "\n + $line = "\n diff --git a/src/dede/dialog/select_soft_post.php b/src/dede/dialog/select_soft_post.php index e6de7ca4..abd10378 100755 --- a/src/dede/dialog/select_soft_post.php +++ b/src/dede/dialog/select_soft_post.php @@ -32,7 +32,7 @@ $cfg_softtype = $cfg_softtype; $cfg_softtype = str_replace('||', '|', $cfg_softtype); $uploadfile_name = trim(preg_replace("#[ \r\n\t\*\%\\\/\?><\|\":]{1,}#", '', $uploadfile_name)); if (!preg_match("#\.(".$cfg_softtype.")#i", $uploadfile_name)) { - ShowMsg("您所上传的{$uploadmbtype}不在许可列表,请更改系统对扩展名限定的配置!", ""); + ShowMsg("您所上传的{$uploadmbtype}不在许可列表,请更改系统对扩展名限定的配置", ""); exit(); } @@ -52,7 +52,7 @@ if (!empty($newname)) { if (!preg_match("#\.#", $filename)) $fs = explode('.', $uploadfile_name); else $fs = explode('.', $filename); if (preg_match("#".$cfg_not_allowall."#", $fs[count($fs) - 1])) { - ShowMsg("您指定的文件名被系统禁止!", 'javascript:;'); + ShowMsg("您指定的文件名被系统禁止", 'javascript:;'); exit(); } if (!preg_match("#\.#", $filename)) $filename = $filename.'.'.$fs[count($fs) - 1]; @@ -60,7 +60,7 @@ if (!empty($newname)) { $filename = $cuserLogin->getUserID().'-'.dd2char(MyDate('ymdHis', $nowtme)); $fs = explode('.', $uploadfile_name); if (preg_match("#".$cfg_not_allowall."#", $fs[count($fs) - 1])) { - ShowMsg("您上传了某些可能存在不安全因素的文件,系统拒绝操作!", 'javascript:;'); + ShowMsg("您上传了某些可能存在不安全因素的文件,系统拒绝操作", 'javascript:;'); exit(); } $filename = $filename.'.'.$fs[count($fs) - 1]; @@ -68,7 +68,7 @@ if (!empty($newname)) { $fullfilename = $cfg_basedir.$activepath.'/'.$filename; $fullfileurl = $activepath.'/'.$filename; -move_uploaded_file($uploadfile, $fullfilename) or die("上传文件到 $fullfilename 失败!"); +move_uploaded_file($uploadfile, $fullfilename) or die("上传文件到 $fullfilename 失败"); @unlink($uploadfile); if ($uploadfile_type == 'application/x-shockwave-flash') { @@ -99,6 +99,6 @@ if ($ck == 1) { ); echo json_encode($arr); } else { - ShowMsg("成功上传文件!", $bkurl."?comeback=".urlencode($filename)."&f=$f&CKEditorFuncNum=$CKEditorFuncNum&activepath=".urlencode($activepath)."&d=".time()); + ShowMsg("成功上传文件", $bkurl."?comeback=".urlencode($filename)."&f=$f&CKEditorFuncNum=$CKEditorFuncNum&activepath=".urlencode($activepath)."&d=".time()); exit(); } diff --git a/src/dede/dialog/select_templets_post.php b/src/dede/dialog/select_templets_post.php index e12ebb08..f1a82251 100755 --- a/src/dede/dialog/select_templets_post.php +++ b/src/dede/dialog/select_templets_post.php @@ -24,7 +24,7 @@ if (!preg_match("#^text#", $uploadfile_type)) { exit(); } if (!preg_match("#\.(".$cfg_txttype.")#i", $uploadfile_name)) { - ShowMsg("您所上传的模板文件类型不能被识别,只允许htm、html、tpl、txt扩展名!", "-1"); + ShowMsg("您所上传的模板文件类型不能被识别,只允许htm、html、tpl、txt扩展名", "-1"); exit(); } if ($filename != '') { @@ -33,12 +33,12 @@ if ($filename != '') { $uploadfile_name = trim(preg_replace("#[ \r\n\t\*\%\\\/\?><\|\":]{1,}#", '', $uploadfile_name)); $filename = $uploadfile_name; if ($filename == '' || !preg_match("#\.(".$cfg_txttype.")#i", $filename)) { - ShowMsg("您所上传的文件存在问题,请检查文件类型是否适合!", "-1"); + ShowMsg("您所上传的文件存在问题,请检查文件类型是否适合", "-1"); exit(); } } $fullfilename = $cfg_basedir.$activepath."/".$filename; -move_uploaded_file($uploadfile, $fullfilename) or die("上传文件到 $fullfilename 失败!"); +move_uploaded_file($uploadfile, $fullfilename) or die("上传文件到 $fullfilename 失败"); @unlink($uploadfile); -ShowMsg("成功上传文件!", "select_templets.php?comeback=".urlencode($filename)."&f=$f&activepath=".urlencode($activepath)."&d=".time()); +ShowMsg("成功上传文件", "select_templets.php?comeback=".urlencode($filename)."&f=$f&activepath=".urlencode($activepath)."&d=".time()); exit(); diff --git a/src/dede/diy_add.php b/src/dede/diy_add.php index 71da767c..c63575a0 100755 --- a/src/dede/diy_add.php +++ b/src/dede/diy_add.php @@ -21,18 +21,18 @@ if (empty($action)) { include(DEDEADMIN."/templets/diy_add.htm"); } else { if (preg_match("#[^0-9-]#", $diyid) || empty($diyid)) { - ShowMsg("'自定义表单diyid'必须为数字!", "-1"); + ShowMsg("'自定义表单diyid'必须为数字", "-1"); exit(); } if ($table == "") { - ShowMsg("表名不能为空!", "-1"); + ShowMsg("表名不能为空", "-1"); exit(); } $public = isset($public) && is_numeric($public) ? $public : 0; $name = dede_htmlspecialchars($name); $row = $dsql->GetOne("SELECT * FROM #@__diyforms WHERE diyid='$diyid' OR `table` LIKE '$table' OR name LIKE '$name' "); if (is_array($row)) { - ShowMsg("可能自定义表单的‘diyid’、‘名称’在数据库中已存在,不能重复使用!", "-1"); + ShowMsg("可能自定义表单的‘diyid’、‘名称’在数据库中已存在,不能重复使用", "-1"); exit(); } $query = "SHOW TABLES FROM {$dsql->dbName} "; diff --git a/src/dede/diy_edit.php b/src/dede/diy_edit.php index c110c468..78274d91 100755 --- a/src/dede/diy_edit.php +++ b/src/dede/diy_edit.php @@ -25,7 +25,7 @@ if ($dopost == "save") { $name = dede_htmlspecialchars($name); $query = "UPDATE `#@__diyforms` SET name = '$name', listtemplate='$listtemplate', viewtemplate='$viewtemplate', posttemplate='$posttemplate', public='$public' WHERE diyid='$diyid' "; $dsql->ExecuteNoneQuery($query); - ShowMsg("成功更改一个自定义表单!", "diy_main.php"); + ShowMsg("成功更改一个自定义表单", "diy_main.php"); exit(); } /*---------------- @@ -45,7 +45,7 @@ function __Delete() $win->AddHidden("job", "yes"); $win->AddHidden("dopost", $dopost); $win->AddHidden("diyid", $diyid); - $win->AddTitle("!将删除所有与该自定义表单相关的文件和数据
您确实要删除 \"".$row['name']."\" 这个自定义表单?"); + $win->AddTitle("将删除所有与该自定义表单相关的文件和数据
您确实要删除 \"".$row['name']."\" 这个自定义表单?"); $winform = $win->GetWindow("ok"); $win->Display(); exit(); @@ -64,7 +64,7 @@ function __Delete() //删除频道配置信息 $dsql->ExecuteNoneQuery("DELETE FROM `#@__diyforms` WHERE diyid='$diyid'"); - ShowMsg("成功删除一个自定义表单!", "diy_main.php"); + ShowMsg("成功删除一个自定义表单", "diy_main.php"); exit(); } } diff --git a/src/dede/diy_field_add.php b/src/dede/diy_field_add.php index a43a93f7..01bbb609 100755 --- a/src/dede/diy_field_add.php +++ b/src/dede/diy_field_add.php @@ -71,10 +71,10 @@ if ($action == 'save') { $rs = $dsql->ExecuteNoneQuery("Update #@__diyforms set `info`='$oksetting' where diyid='$diyid' "); if (!$rs) { $grr = $dsql->GetError(); - ShowMsg("保存节点配置出错!".$grr, "javascript:;"); + ShowMsg("保存节点配置出错".$grr, "javascript:;"); exit(); } - ShowMsg("成功增加一个字段!", "diy_edit.php?diyid=$diyid"); + ShowMsg("成功增加一个字段", "diy_edit.php?diyid=$diyid"); exit(); } diff --git a/src/dede/diy_field_edit.php b/src/dede/diy_field_edit.php index 4165323c..6cd13190 100755 --- a/src/dede/diy_field_edit.php +++ b/src/dede/diy_field_edit.php @@ -45,7 +45,7 @@ function _SAVE() if ($action == 'save') { if (!isset($fieldtypes[$dtype])) { - ShowMsg("您修改的是系统专用类型的数据,禁止操作!", "-1"); + ShowMsg("您修改的是系统专用类型的数据,禁止操作", "-1"); exit(); } @@ -101,7 +101,7 @@ if ($action == 'save') { $oksetting = $dtp->GetResultNP(); $oksetting = addslashes($oksetting); $dsql->ExecuteNoneQuery("UPDATE #@__diyforms SET info='$oksetting' WHERE diyid='$diyid' "); - ShowMsg("成功更改一个字段的配置!", "diy_edit.php?diyid={$diyid}"); + ShowMsg("成功更改一个字段的配置", "diy_edit.php?diyid={$diyid}"); exit(); } /*------------------ @@ -117,7 +117,7 @@ function _DELETE() $oksetting = addslashes($dtp->GetResultNP()); $dsql->ExecuteNoneQuery("UPDATE #@__diyforms SET info='$oksetting' WHERE diyid='$diyid' "); $dsql->ExecuteNoneQuery("ALTER TABLE `$trueTable` DROP `$fname` "); - ShowMsg("成功删除一个字段!", "diy_edit.php?diyid=$diyid"); + ShowMsg("成功删除一个字段", "diy_edit.php?diyid=$diyid"); exit(); } require_once(DEDEADMIN."/templets/diy_field_edit.htm"); diff --git a/src/dede/diy_list.php b/src/dede/diy_list.php index 6b21f963..b868c1ba 100755 --- a/src/dede/diy_list.php +++ b/src/dede/diy_list.php @@ -80,7 +80,7 @@ if ($action == 'post') { if (empty($do)) { $id = isset($id) && is_numeric($id) ? $id : 0; if (empty($id)) { - showMsg('非法操作!未指定id', 'javascript:;'); + showMsg('非法操作未指定id', 'javascript:;'); exit(); } $query = "SELECT * FROM {$diy->table} WHERE id=$id"; diff --git a/src/dede/erraddsave.php b/src/dede/erraddsave.php index 044a1f26..5509ad2b 100755 --- a/src/dede/erraddsave.php +++ b/src/dede/erraddsave.php @@ -63,7 +63,7 @@ function typename($me) if ($dopost == "delete") { if ($id == '') { - ShowMsg("参数无效!", "-1"); + ShowMsg("参数无效", "-1"); exit(); } @@ -74,7 +74,7 @@ if ($dopost == "delete") { $query = "DELETE FROM `#@__erradd` WHERE `id` = '$var'"; $dsql->ExecuteNoneQuery($query); } - ShowMsg("成功删除指定的文档!", "erraddsave.php"); + ShowMsg("成功删除指定的文档", "erraddsave.php"); exit(); } else { require_once(DEDEINC."/oxwindow.class.php"); diff --git a/src/dede/feedback_edit.php b/src/dede/feedback_edit.php index ebb058fc..860b613b 100755 --- a/src/dede/feedback_edit.php +++ b/src/dede/feedback_edit.php @@ -28,7 +28,7 @@ if ($dopost == 'edit') { } $query = "UPDATE `#@__feedback` SET username='$username',msg='$msg',ischeck=1 WHERE id=$id"; $dsql->ExecuteNoneQuery($query); - ShowMsg("成功回复一则留言!", $ENV_GOBACK_URL); + ShowMsg("成功回复一则留言", $ENV_GOBACK_URL); exit(); } elseif ($dopost === 'makehtml') { require_once(DEDEADMIN.'/inc/inc_archives_functions.php'); diff --git a/src/dede/feedback_main.php b/src/dede/feedback_main.php index 2f2f75da..822b5654 100755 --- a/src/dede/feedback_main.php +++ b/src/dede/feedback_main.php @@ -36,7 +36,7 @@ function jsTrimjajx($str, $len) if (!empty($job)) { $ids = preg_replace("#[^0-9,]#", '', $fid); if (empty($ids)) { - ShowMsg("您没选中任何选项!", $_COOKIE['ENV_GOBACK_URL'], 0, 500); + ShowMsg("您没选中任何选项", $_COOKIE['ENV_GOBACK_URL'], 0, 500); exit; } } else { diff --git a/src/dede/file_class.php b/src/dede/file_class.php index 1b49c1c4..31c1668b 100755 --- a/src/dede/file_class.php +++ b/src/dede/file_class.php @@ -33,7 +33,7 @@ class FileManagement if (($newname != $oldname) && is_writable($oldname)) { rename($oldname, $newname); } - ShowMsg("成功更改一个文件名!", "file_manage_main.php?activepath=".$this->activeDir); + ShowMsg("成功更改一个文件名", "file_manage_main.php?activepath=".$this->activeDir); return 0; } @@ -45,10 +45,10 @@ class FileManagement if (is_writable($this->baseDir.$this->activeDir)) { MkdirAll($dirname, $GLOBALS['cfg_dir_purview']); CloseFtp(); - ShowMsg("成功创建一个新目录!", "file_manage_main.php?activepath=".$this->activeDir."/".$newdir); + ShowMsg("成功创建一个新目录", "file_manage_main.php?activepath=".$this->activeDir."/".$newdir); return 1; } else { - ShowMsg("创建新目录失败,因为这个位置不允许写入!", "file_manage_main.php?activepath=".$this->activeDir); + ShowMsg("创建新目录失败,因为这个位置不允许写入", "file_manage_main.php?activepath=".$this->activeDir); return 0; } } @@ -80,14 +80,14 @@ class FileManagement copy($oldfile, $truepath."/$mfile"); } unlink($oldfile); - ShowMsg("成功移动文件!", "file_manage_main.php?activepath=$mpath", 0, 1000); + ShowMsg("成功移动文件", "file_manage_main.php?activepath=$mpath", 0, 1000); return 1; } else { - ShowMsg("移动文件 $oldfile -> $truepath/$mfile 失败,可能是某个位置权限不足!", "file_manage_main.php?activepath=$mpath", 0, 1000); + ShowMsg("移动文件 $oldfile -> $truepath/$mfile 失败,可能是某个位置权限不足", "file_manage_main.php?activepath=$mpath", 0, 1000); return 0; } } else { - ShowMsg("对不起,您移动的路径不合法!", "-1", 0, 5000); + ShowMsg("对不起,您移动的路径不合法", "-1", 0, 5000); return 0; } } @@ -157,11 +157,11 @@ class FileManagement $this->RmDirFiles($filename); } else { // 完善用户体验,by:sumic - ShowMsg("系统禁止删除".$t."!", "file_manage_main.php?activepath=".$this->activeDir); + ShowMsg("系统禁止删除".$t."", "file_manage_main.php?activepath=".$this->activeDir); exit; } } - ShowMsg("成功删除一个".$t."!", "file_manage_main.php?activepath=".$this->activeDir); + ShowMsg("成功删除一个".$t."", "file_manage_main.php?activepath=".$this->activeDir); return 0; } } diff --git a/src/dede/file_manage_control.php b/src/dede/file_manage_control.php index 342ff05b..3ead385c 100755 --- a/src/dede/file_manage_control.php +++ b/src/dede/file_manage_control.php @@ -68,9 +68,9 @@ function __saveEdit(); fputs($fp, $str); fclose($fp); if (empty($backurl)) { - ShowMsg("成功保存一个文件!", "file_manage_main.php?activepath=$activepath"); + ShowMsg("成功保存一个文件", "file_manage_main.php?activepath=$activepath"); } else { - ShowMsg("成功保存文件!", $backurl); + ShowMsg("成功保存文件", $backurl); } exit(); } @@ -90,7 +90,7 @@ else if($fmdo=="editview") { $backurl = "file_manage_main.php?activepath=$activepath"; } - ShowMsg("成功保存文件!",$backurl); + ShowMsg("成功保存文件",$backurl); exit(); } */ @@ -126,7 +126,7 @@ else if ($fmdo == "space") { } else { $ecpath = $activepath; } - $titleinfo = "目录 $ecpath 空间使用状况:
"; + $titleinfo = "目录 $ecpath 空间使用状况:
"; $wintitle = "文件管理"; $wecome_info = "文件管理::空间大小检查 [文件浏览器]"; $activepath = $cfg_basedir.$activepath; diff --git a/src/dede/freelist_main.php b/src/dede/freelist_main.php index 933ddf42..405b60ee 100755 --- a/src/dede/freelist_main.php +++ b/src/dede/freelist_main.php @@ -68,10 +68,10 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid') $start = ($pageno-1) * $pagesize; $printhead ="
- 如果您想对旧的文章应用随机模板设置,请点击此对旧文章进行处理(必须设置好模板项)! + + 如果您想对旧的文章应用随机模板设置,请点击此对旧文章进行处理(必须设置好模板项)   设置全部   取消全部   $okmsg @@ -115,7 +115,7 @@ $win = new OxWindow(); $win->Init('article_template_rand.php', 'js/blank.js', 'POST'); $win->AddHidden('dopost', 'save'); $win->AddHidden('token', $_SESSION['token']); -$win->AddTitle("本设置仅适用于系统默认的文章模型,设置后发布文章时会自动按指定的模板随机获取一个,如果不想使用此功能,把它设置为空即可!"); +$win->AddTitle("本设置仅适用于系统默认的文章模型,设置后发布文章时会自动按指定的模板随机获取一个,如果不想使用此功能,把它设置为空即可"); $win->AddMsgItem($msg); $winform = $win->GetWindow('ok'); $win->Display(); diff --git a/src/dede/article_test_same.php b/src/dede/article_test_same.php index 761117db..19e2714b 100755 --- a/src/dede/article_test_same.php +++ b/src/dede/article_test_same.php @@ -18,7 +18,7 @@ if ($dopost == 'analyse') { if (is_array($arr)) { $maintable = $arr['maintable']; } else { - showmsg('频道id不正确,无法处理!', 'javascript:;'); + showmsg('频道id不正确,无法处理', 'javascript:;'); exit(); } $dsql->SetQuery("SELECT COUNT(title) AS dd,title FROM `$maintable` WHERE channel='$channelid' GROUP BY title ORDER BY dd DESC LIMIT 0, $pagesize"); @@ -35,7 +35,7 @@ else if ($dopost == 'delsel') { if (empty($titles)) { header("Content-Type: text/html; charset={$cfg_ver_lang}"); echo "\r\n"; - echo "没有指定删除的文档!"; + echo "没有指定删除的文档"; exit(); } @@ -72,7 +72,7 @@ else if ($dopost == 'delsel') { } } $dsql->ExecuteNoneQuery(" OPTIMIZE TABLE `$maintable`; "); - ShowMsg("一共删除了[{$totalarc}]篇重复的文档!", "javascript:;"); + ShowMsg("一共删除了[{$totalarc}]篇重复的文档", "javascript:;"); exit(); } diff --git a/src/dede/article_test_title.php b/src/dede/article_test_title.php index bc1e20ce..e51591b7 100755 --- a/src/dede/article_test_title.php +++ b/src/dede/article_test_title.php @@ -15,5 +15,5 @@ if (empty($t) || $cfg_check_title == 'N') exit; $row = $dsql->GetOne("SELECT id FROM `#@__archives` WHERE title LIKE '$t' "); if (is_array($row)) { - echo "提示:系统已经存在标题为 '$t' 的文档。[关闭]"; + echo "提示:系统已经存在标题为 '$t' 的文档。[关闭]"; } diff --git a/src/dede/cards_make.php b/src/dede/cards_make.php index 3a00bd07..6995a1f5 100755 --- a/src/dede/cards_make.php +++ b/src/dede/cards_make.php @@ -55,5 +55,5 @@ elseif ($dopost == 'make') { $dsql->ExecuteNoneQuery($inquery); echo "成功生成点卡:{$cardid}
"; } - echo "成功生成 {$mnum} 个点卡!"; + echo "成功生成 {$mnum} 个点卡"; } diff --git a/src/dede/cards_manage.php b/src/dede/cards_manage.php index 7d715260..f36ccae2 100755 --- a/src/dede/cards_manage.php +++ b/src/dede/cards_manage.php @@ -21,7 +21,7 @@ if ($dopost == "delete") { } if ($dquery != "") $dquery = " WHERE ".$dquery; $dsql->ExecuteNoneQuery("DELETE FROM #@__moneycard_record $dquery"); - ShowMsg("成功删除指定的记录!", "cards_manage.php"); + ShowMsg("成功删除指定的记录", "cards_manage.php"); exit(); } else { $addsql = ''; diff --git a/src/dede/cards_type.php b/src/dede/cards_type.php index 1d075a5d..b414ad68 100755 --- a/src/dede/cards_type.php +++ b/src/dede/cards_type.php @@ -44,6 +44,6 @@ if ($dopost == "save") { $dsql->ExecuteNoneQuery($query); } header("Content-Type: text/html; charset={$cfg_soft_lang}"); - echo ""; + echo ""; } require_once(DEDEADMIN."/templets/cards_type.htm"); diff --git a/src/dede/catalog_add.php b/src/dede/catalog_add.php index 5dea5c78..1ba6231b 100755 --- a/src/dede/catalog_add.php +++ b/src/dede/catalog_add.php @@ -27,7 +27,7 @@ if ($id == 0 && $reid == 0) { } else { $checkID = empty($id) ? $reid : $id; CheckPurview('t_AccNew'); - CheckCatalog($checkID, '您无权在本栏目下创建子类!'); + CheckCatalog($checkID, '您无权在本栏目下创建子类'); } if (empty($myrow)) $myrow = array(); @@ -136,7 +136,7 @@ function action_savequick(){ } } } UpDateCatCache(); - ShowMsg('成功增加指定栏目!', 'catalog_main.php'); + ShowMsg('成功增加指定栏目', 'catalog_main.php'); exit(); } /*--------------------- @@ -173,11 +173,11 @@ function action_save(){ } if ($siteurl != '') { $siteurl = preg_replace("#\/$#", "", $siteurl); if (!preg_match("#http:\/\/#i", $siteurl)) { - ShowMsg("您绑定的二级域名无效,请用(http://host)的形式!", "-1"); + ShowMsg("您绑定的二级域名无效,请用(http://host)的形式", "-1"); exit(); } if (preg_match("#".$cfg_basehost."#i", $siteurl)) { - ShowMsg("您绑定的二级域名与当前站点是同一个域,不需要绑定!", "-1"); + ShowMsg("您绑定的二级域名与当前站点是同一个域,不需要绑定", "-1"); exit(); } } @@ -188,7 +188,7 @@ function action_save(){ } $true_typedir = str_replace("{cmspath}", $cfg_cmspath, $typedir); $true_typedir = preg_replace("#\/{1,}#", "/", $true_typedir); if (!CreateDir($true_typedir)) { - ShowMsg("创建目录 {$true_typedir} 失败,请检查您的路径是否存在问题!", "-1"); + ShowMsg("创建目录 {$true_typedir} 失败,请检查您的路径是否存在问题", "-1"); exit(); } } @@ -201,14 +201,14 @@ function action_save(){ } '$ispart','$corank','$description','$keywords','$seotitle','$moresite','$siteurl','$sitepath','$ishidden','$cross','$crossid','$content','$smalltypes')"; if (!$dsql->ExecuteNoneQuery($in_query)) { - ShowMsg("保存目录数据时失败,请检查您的输入资料是否存在问题!", "-1"); + ShowMsg("保存目录数据时失败,请检查您的输入资料是否存在问题", "-1"); exit(); } UpDateCatCache(); if ($reid > 0) { PutCookie('lastCid', GetTopid($reid), 3600 * 24, '/'); } - ShowMsg("成功创建一个分类!", "catalog_main.php"); + ShowMsg("成功创建一个分类", "catalog_main.php"); exit(); } //End dopost==save diff --git a/src/dede/catalog_del.php b/src/dede/catalog_del.php index fae0db39..9fdd61df 100755 --- a/src/dede/catalog_del.php +++ b/src/dede/catalog_del.php @@ -18,13 +18,13 @@ require_once(DEDEINC.'/oxwindow.class.php'); $id = trim(preg_replace("#[^0-9]#", '', $id)); //检查栏目操作许可 -CheckCatalog($id, "您无权删除本栏目!"); +CheckCatalog($id, "您无权删除本栏目"); if (empty($dopost)) $dopost = ''; if ($dopost == 'ok') { $ut = new TypeUnit(); $ut->DelType($id, $delfile); UpDateCatCache(); - ShowMsg("成功删除一个栏目!", "catalog_main.php"); + ShowMsg("成功删除一个栏目", "catalog_main.php"); exit(); } $dsql->SetQuery("SELECT typename,typedir FROM #@__arctype WHERE id=".$id); diff --git a/src/dede/catalog_do.php b/src/dede/catalog_do.php index 67c96232..fe0ca1cb 100755 --- a/src/dede/catalog_do.php +++ b/src/dede/catalog_do.php @@ -11,7 +11,7 @@ */ require_once(dirname(__FILE__).'/config.php'); if (empty($dopost)) { - ShowMsg("对不起,请指定栏目参数!", "catalog_main.php"); + ShowMsg("对不起,请指定栏目参数", "catalog_main.php"); exit(); } $cid = empty($cid) ? 0 : intval($cid); @@ -37,7 +37,7 @@ if ($dopost == "addArchives") { } $gurl = $row["addcon"]; if ($gurl == "") { - ShowMsg("对不起,您指的栏目可能有误!", "catalog_main.php"); + ShowMsg("对不起,您指的栏目可能有误", "catalog_main.php"); exit(); } @@ -64,7 +64,7 @@ function listArchives(); $typename = $row["typename"]; $channelname = $row["channelname"]; if ($gurl == "") { - ShowMsg("对不起,您指的栏目可能有误!", "catalog_main.php"); + ShowMsg("对不起,您指的栏目可能有误", "catalog_main.php"); exit(); } } else if ($channelid > 0) { @@ -104,7 +104,7 @@ function upRank() CheckPurview('t_Edit,t_AccEdit'); //检查栏目操作许可 - CheckCatalog($cid, "您无权更改本栏目!"); + CheckCatalog($cid, "您无权更改本栏目"); $row = $dsql->GetOne("SELECT reid,sortrank FROM #@__arctype WHERE id='$cid'"); $reid = $row['reid']; $sortrank = $row['sortrank']; @@ -211,7 +211,7 @@ function unitCatalog() { } $reid = $tl->TypeInfos['reid']; $channelid = $tl->TypeInfos['channeltype']; if (!empty($row['dd'])) { - ShowMsg("栏目: $typename($typeid) 有子栏目,不能进行合并操作!", '-1'); + ShowMsg("栏目: $typename($typeid) 有子栏目,不能进行合并操作", '-1'); exit(); } $typeOptions = $tl->GetOptionArray(0, 0, $channelid); @@ -232,11 +232,11 @@ function unitCatalog() { } exit(); } else { if ($typeid == $unittype) { - ShowMsg("同一栏目无法合并,请后退重试!", '-1'); + ShowMsg("同一栏目无法合并,请后退重试", '-1'); exit(); } if (IsParent($unittype, $typeid)) { - ShowMsg('不能从父类合并到子类!', 'catalog_main.php'); + ShowMsg('不能从父类合并到子类', 'catalog_main.php'); exit(); } $row = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid' "); @@ -249,7 +249,7 @@ function unitCatalog() { } $dsql->ExecuteNoneQuery("UPDATE `$addtable` SET typeid='$unittype' WHERE typeid='$typeid' "); $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctype` WHERE id='$typeid' "); UpDateCatCache(); - ShowMsg('成功合并指定栏目!', 'catalog_main.php'); + ShowMsg('成功合并指定栏目', 'catalog_main.php'); exit(); } } @@ -284,16 +284,16 @@ function moveCatalog() { } exit(); } else { if ($typeid == $movetype) { - ShowMsg('移对对象和目标位置相同!', 'catalog_main.php'); + ShowMsg('移对对象和目标位置相同', 'catalog_main.php'); exit(); } if (IsParent($movetype, $typeid)) { - ShowMsg('不能从父类移动到子类!', 'catalog_main.php'); + ShowMsg('不能从父类移动到子类', 'catalog_main.php'); exit(); } $dsql->ExecuteNoneQuery(" UPDATE `#@__arctype` SET reid='$movetype' WHERE id='$typeid' "); UpDateCatCache(); - ShowMsg('成功移动目录!', 'catalog_main.php'); + ShowMsg('成功移动目录', 'catalog_main.php'); exit(); } } diff --git a/src/dede/config.php b/src/dede/config.php index 6822c08f..72babafc 100755 --- a/src/dede/config.php +++ b/src/dede/config.php @@ -100,7 +100,7 @@ if (strlen($cfg_cookie_encode) <= 10) { $dsql->ExecuteNoneQuery("UPDATE `#@__sysconfig` SET `value`='{$hash}' WHERE varname='cfg_cookie_encode' "); $configfile = DEDEDATA . '/config.cache.inc.php'; if (!is_writeable($configfile)) { - echo "配置文件'{$configfile}'不支持写入,无法修改系统配置参数!"; + echo "配置文件'{$configfile}'不支持写入,无法修改系统配置参数"; exit(); } $fp = fopen($configfile, 'w'); diff --git a/src/dede/content_att.php b/src/dede/content_att.php index 980eb1a1..fefcfac8 100755 --- a/src/dede/content_att.php +++ b/src/dede/content_att.php @@ -24,7 +24,7 @@ if ($dopost == "save") { $query = "UPDATE `#@__arcatt` SET `attname`='$attname',`sortid`='$sortid' WHERE att='$att' "; $dsql->ExecuteNoneQuery($query); } - echo ""; + echo ""; } include DedeInclude('templets/content_att.htm'); diff --git a/src/dede/content_batchup_action.php b/src/dede/content_batchup_action.php index 50535789..b996ebd0 100755 --- a/src/dede/content_batchup_action.php +++ b/src/dede/content_batchup_action.php @@ -60,7 +60,7 @@ if (!empty($heightdone)) $action = $heightdone; //指量审核 if ($action == 'check') { if (empty($startid) || empty($endid) || $endid < $startid) { - ShowMsg('该操作必须指定起始ID!', 'javascript:;'); + ShowMsg('该操作必须指定起始ID', 'javascript:;'); exit(); } $jumpurl = "makehtml_archives_action.php?endid=$endid&startid=$startid"; @@ -80,7 +80,7 @@ if ($action == 'check') { //批量删除 else if ($action == 'del') { if (empty($startid) || empty($endid) || $endid < $startid) { - ShowMsg('该操作必须指定起始ID!', 'javascript:;'); + ShowMsg('该操作必须指定起始ID', 'javascript:;'); exit(); } $dsql->SetQuery("SELECT id FROM `#@__archives` $gwhere"); @@ -89,7 +89,7 @@ else if ($action == 'del') { while ($row = $dsql->GetObject('x')) { if (DelArc($row->id)) $tdd++; } - ShowMsg("成功删除 $tdd 条记录!", "javascript:;"); + ShowMsg("成功删除 $tdd 条记录", "javascript:;"); exit(); } //删除空标题文档 @@ -100,7 +100,7 @@ else if ($action == 'delnulltitle') { while ($row = $dsql->GetObject('x')) { if (DelArc($row->id)) $tdd++; } - ShowMsg("成功删除 $tdd 条记录!", "javascript:;"); + ShowMsg("成功删除 $tdd 条记录", "javascript:;"); exit(); } //删除空内容文章 @@ -111,33 +111,33 @@ else if ($action == 'delnullbody') { while ($row = $dsql->GetObject('x')) { if (DelArc($row->aid)) $tdd++; } - ShowMsg("成功删除 $tdd 条记录!", "javascript:;"); + ShowMsg("成功删除 $tdd 条记录", "javascript:;"); exit(); } //修正缩略图错误 else if ($action == 'modddpic') { $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET litpic='' WHERE trim(litpic)='litpic' "); - ShowMsg("成功修正缩略图错误!", "javascript:;"); + ShowMsg("成功修正缩略图错误", "javascript:;"); exit(); } //批量移动 else if ($action == 'move') { if (empty($typeid)) { - ShowMsg('该操作必须指定栏目!', 'javascript:;'); + ShowMsg('该操作必须指定栏目', 'javascript:;'); exit(); } $typeold = $dsql->GetOne("SELECT * FROM #@__arctype WHERE id='$typeid'; "); $typenew = $dsql->GetOne("SELECT * FROM #@__arctype WHERE id='$newtypeid'; "); if (!is_array($typenew)) { - ShowMsg("无法检测移动到的新栏目的信息,不能完成操作!", "javascript:;"); + ShowMsg("无法检测移动到的新栏目的信息,不能完成操作", "javascript:;"); exit(); } if ($typenew['ispart'] != 0) { - ShowMsg("您不能把数据移动到非最终列表的栏目!", "javascript:;"); + ShowMsg("您不能把数据移动到非最终列表的栏目", "javascript:;"); exit(); } if ($typenew['channeltype'] != $typeold['channeltype']) { - ShowMsg("不能把数据移动到内容类型不同的栏目!", "javascript:;"); + ShowMsg("不能把数据移动到内容类型不同的栏目", "javascript:;"); exit(); } $gwhere .= " And channel='".$typenew['channeltype']."' And title like '%$keyword%'"; @@ -175,12 +175,12 @@ else if ($action == 'delnulltitle') { while ($row = $dsql->GetObject('x')) { if (DelArc($row->id)) $tdd++; } - ShowMsg("成功删除 $tdd 条记录!", "javascript:;"); + ShowMsg("成功删除 $tdd 条记录", "javascript:;"); exit(); } //修正缩略图错误 else if ($action == 'modddpic') { $dsql->ExecuteNoneQuery("UPDATE #@__archives SET litpic='' WHERE trim(litpic)='litpic' "); - ShowMsg("成功修正缩略图错误!", "javascript:;"); + ShowMsg("成功修正缩略图错误", "javascript:;"); exit(); } diff --git a/src/dede/content_list.php b/src/dede/content_list.php index 6e2fb9a5..d486d149 100755 --- a/src/dede/content_list.php +++ b/src/dede/content_list.php @@ -39,7 +39,7 @@ if (TestPurview('a_List')) {; $admin_catalog = join(',', $admin_catalogs); $userCatalogSql = " arc.typeid IN($admin_catalog) "; } else { - CheckCatalog($cid, '您无权浏览非指定栏目的内容!'); + CheckCatalog($cid, '您无权浏览非指定栏目的内容'); } if (TestPurview('a_MyList')) $mid = $cuserLogin->getUserID(); } diff --git a/src/dede/content_sg_list.php b/src/dede/content_sg_list.php index 88ce01ee..cf362e05 100755 --- a/src/dede/content_sg_list.php +++ b/src/dede/content_sg_list.php @@ -17,7 +17,7 @@ if (!isset($keyword)) $keyword = ''; if (!isset($arcrank)) $arcrank = ''; if (empty($cid) && empty($channelid)) { - ShowMsg("该页面必须指定栏目ID或内容模型ID才能浏览!", "javascript:;"); + ShowMsg("该页面必须指定栏目ID或内容模型ID才能浏览", "javascript:;"); exit(); } @@ -30,7 +30,7 @@ if (TestPurview('a_List')) { if ($cid == 0) { $ucid = $cid = $cuserLogin->getUserChannel(); } else { - CheckCatalog($cid, "您无权浏览非指定栏目的内容!"); + CheckCatalog($cid, "您无权浏览非指定栏目的内容"); } } @@ -43,7 +43,7 @@ setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); $tl = new TypeLink($cid); $listtable = @trim($tl->TypeInfos['addtable']); if (!empty($channelid) && !empty($ucid) && $tl->TypeInfos['channeltype'] != $channelid) { - ShowMsg('您没权限访问此页!', 'javascript:;'); + ShowMsg('您没权限访问此页', 'javascript:;'); exit(); } diff --git a/src/dede/content_tj.php b/src/dede/content_tj.php index 48e169ad..cd6b2658 100755 --- a/src/dede/content_tj.php +++ b/src/dede/content_tj.php @@ -40,7 +40,7 @@ function GetArchives($dsql, $ordertype) $dsql->Execute('ga'); while ($row = $dsql->GetObject('ga')) { if (preg_match("#feedback#i", $ordertype)) { - $moreinfo = "[id}'>评论:{$row->scores}]"; + $moreinfo = "[id}'>评论:{$row->scores}]"; } else { $moreinfo = "[点击:{$row->click}]"; } diff --git a/src/dede/css/base.css b/src/dede/css/base.css index 2894864c..590aa680 100644 --- a/src/dede/css/base.css +++ b/src/dede/css/base.css @@ -1 +1 @@ -*{font-size:12px;letter-spacing:.4px}body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;line-height:1.5}form,h1,h2,h3,ul,ol,div{margin:0;padding:0}td{line-height:1.5}td,th,div{word-break:break-all;word-wrap:break-word}b,strong{font-weight:400}li,dd{margin:0;padding:0;list-style-type:none}select{height:calc(1.5em + .75rem + 2px);padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}input{padding:.25rem .5rem;height:calc(1.5em + .75rem + 2px);line-height:18px;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;line-height:1.5;color:#fff;background:#28a745;border-radius:.2rem;transition:all .6s;border:0}textarea{padding:.25rem .5rem;line-height:18px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input:focus,textarea:focus{border-color:#28a745;box-shadow:0 0 2px #28a745;outline:none}input[type=radio],input[type=checkbox]{box-shadow:none;outline:none}label{display:inline-block;margin:10px 0}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}h1,h2,h3{font-size:18px;color:#424b51}a:link{color:#424b51;text-decoration:none}a:hover{opacity:.8}a:visited{color:#666}.np{border:0}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f2f2f2;border-bottom:1px solid #ccc;border-radius:.2rem;border:0;cursor:pointer}.coolbg2{height:18px;background:#DFDDD2;border:1px solid #000}.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6}.bline{height:36px;background:#fff;border-bottom:1px solid #eee}#uploadfield{float:left}.bline2{border-bottom:1px solid #eee}.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#E4F7D7;cursor:pointer}.coolbt2{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#F7FCDA}.coolbg3{width:140px;height:20px;border:1px solid #BDC5B4;background:#DFDDD2;text-align:right}.coolbg61{width:380px;height:26px;line-height:26px;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;background:#E7F3B1;text-align:right}.coolbg62{padding:6px;width:380px;height:300px;border:1px solid #BDC5B4;background:#F8FDF0}.coolbg4{width:190px;height:24px;line-height:24px;border-bottom:1px solid #C9CFC1;background:#F9FCDC url(../images/dlgtitle.gif)repeat-x;text-align:right}.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC}.wsselect{height:60px;line-height:24px;background:#FCFEF1;overflow:auto}.dlg{padding:.25rem .5rem;border:2px solid #008E38;background:#F0FAEB;width:360px;line-height:160%}.pubdlg{background:#fff;border:4px solid #008E38;border-radius:.2rem;z-index:8888}.pubdlg .title{height:29px;line-height:29px;border-bottom:1px solid #C9CFC1;background:url(../images/dlgtitle.gif)repeat-x;text-align:left;cursor:move}.pubdlg .titLeft{float:left;padding-left:10px;line-height:29px;font-weight:600;color:#424b51}.pubdlg .titRight{float:right;padding:0}.fullpagediv{position:absolute;top:0;left:0;width:100%;height:120%;background:#cdcdcd;opacity:.5;z-index:1999}.quicksel{margin-left:10px;margin-top:10px;width:680px;height:420px;overflow:auto;z-index:10005}.quickselfoot{padding-top:8px;border-top:1px dashed #C0CC9D}.quickselItem{margin-bottom:8px}.quickselItem .topcat{padding-left:6px;line-height:24px;border-bottom:1px dashed #ccc;background:#FBFEEF;clear:both}.quickselItem .soncat{padding-left:10px}.quickselItem .item{float:left;margin-right:8px}.mysource,.mywriter{padding:.25rem .5rem;width:280px;line-height:160%;border:4px solid #008E38;background:#F0FAEB;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #008E38;background:#F0FAEB}#_mysource{z-index:10003}#_mywriter{z-index:10004}#uploadwait{z-index:19999}.option1{background:#DCECA6}.option2{background:#F7FBD2}.option3{background:#fff}.ininput{width:96%;height:20px;border:1px solid #fff}.nbt{padding:2px;background:#fff url(../images/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.waitpage{position:absolute;top:0;left:0;opacity:.7;background:#ababab url(../../images/loading1.gif)center no-repeat;z-index:10000}.divpre img{max-width:150px;max-height:100px}.divpre{overflow:hidden}.autoinput{padding-left:6px;width:90%}.bodytitle{margin:auto;width:98%;height:28px;border:1px dotted #BFD67C;background:url(../images/wbg.gif)}.bodytitle div{float:left}.bodytitletxt{padding-left:6px;line-height:28px}.tbtitle td{padding:6px}.tblist td{padding:6px;background:#fff}.tblist td.tbsname{padding:6px;background:#F9FFE6}.colordlg{padding:.25rem .5rem;width:100px;line-height:160%;border:2px dashed #008E38;background:#F0FAEB;z-index:10005}option.alltype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(../images/arrr.gif)10px 4px no-repeat}.ilist{border-top:1px dashed #eee;border-bottom:1px dashed #eee;border-left:1px dashed #eee}.ilist td{border-right:1px dashed #eee}#typeid2{padding:0;float:left;height:18px;font-size:12px;background:url(../images/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:85px;height:20px;opacity:0;cursor:pointer}.litpic_span{margin-left:-60px;width:76px;height:22px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate{padding-left:30px;background:url(../images/calendar.gif)10px no-repeat}#title{background:url(../images/ruler.gif)repeat-x 0px 10px}.spec{width:60px}.gtab a{display:block;float:left;width:80px;height:26px;line-height:26px;text-align:center}.albCt img{cursor:pointer}.maintable{width:98%!important;border:1px solid #dee2e6}span.page-link{color:#fff;background:#28a745}a.btn{color:white!important}.btn-success{background:#28a745;border-color:#28a745}.table{color:#424b51}.table td,.table th{padding:.6rem;vertical-align:middle}.table th img,.table td img{vertical-align:text-bottom} \ No newline at end of file +*{font-size:12px;letter-spacing:.4px}body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;line-height:1.5}form,h1,h2,h3,ul,ol,div{margin:0;padding:0}td{line-height:1.5}td,th,div{word-break:break-all;word-wrap:break-word}b,strong{font-weight:400}li,dd{margin:0;padding:0;list-style-type:none}select{height:calc(1.5em + .75rem + 2px);padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}input{padding:.25rem .5rem;height:calc(1.5em + .75rem + 2px);line-height:18px;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=radio],input[type=checkbox]{height:auto;box-shadow:none;outline:none}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;line-height:1.5;color:#fff;background:#28a745;border-radius:.2rem;transition:all .6s;border:0}input:focus,textarea:focus{border-color:#28a745;box-shadow:0 0 2px #28a745;outline:none}textarea{padding:.25rem .5rem;line-height:18px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}label{display:inline-block;margin:10px 0}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}h1,h2,h3{font-size:18px;color:#424b51}a:link{color:#424b51;text-decoration:none}a:hover{opacity:.8}a:visited{color:#666}.np{border:0}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f2f2f2;border-bottom:1px solid #ccc;border-radius:.2rem;border:0;cursor:pointer}.coolbg2{height:18px;background:#DFDDD2;border:1px solid #000}.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6}.bline{height:36px;background:#fff;border-bottom:1px solid #eee}#uploadfield{float:left}.bline2{border-bottom:1px solid #eee}.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#E4F7D7;cursor:pointer}.coolbt2{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#F7FCDA}.coolbg3{width:140px;height:20px;border:1px solid #BDC5B4;background:#DFDDD2;text-align:right}.coolbg61{width:380px;height:26px;line-height:26px;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;background:#E7F3B1;text-align:right}.coolbg62{padding:6px;width:380px;height:300px;border:1px solid #BDC5B4;background:#F8FDF0}.coolbg4{width:190px;height:24px;line-height:24px;border-bottom:1px solid #C9CFC1;background:#F9FCDC url(../images/dlgtitle.gif)repeat-x;text-align:right}.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC}.wsselect{height:60px;line-height:24px;background:#FCFEF1;overflow:auto}.dlg{padding:.25rem .5rem;border:2px solid #008E38;background:#F0FAEB;width:360px;line-height:160%}.pubdlg{background:#fff;border:4px solid #008E38;border-radius:.2rem;z-index:8888}.pubdlg .title{height:29px;line-height:29px;border-bottom:1px solid #C9CFC1;background:url(../images/dlgtitle.gif)repeat-x;text-align:left;cursor:move}.pubdlg .titLeft{float:left;padding-left:10px;line-height:29px;font-weight:600;color:#424b51}.pubdlg .titRight{float:right;padding:0}.fullpagediv{position:absolute;top:0;left:0;width:100%;height:120%;background:#cdcdcd;opacity:.5;z-index:1999}.quicksel{margin-left:10px;margin-top:10px;width:680px;height:420px;overflow:auto;z-index:10005}.quickselfoot{padding-top:8px;border-top:1px dashed #C0CC9D}.quickselItem{margin-bottom:8px}.quickselItem .topcat{padding-left:6px;line-height:24px;border-bottom:1px dashed #ccc;background:#FBFEEF;clear:both}.quickselItem .soncat{padding-left:10px}.quickselItem .item{float:left;margin-right:8px}.mysource,.mywriter{padding:.25rem .5rem;width:280px;line-height:160%;border:4px solid #008E38;background:#F0FAEB;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #008E38;background:#F0FAEB}#_mysource{z-index:10003}#_mywriter{z-index:10004}#uploadwait{z-index:19999}.option1{background:#DCECA6}.option2{background:#F7FBD2}.option3{background:#fff}.ininput{width:96%;height:20px;border:1px solid #fff}.nbt{padding:2px;background:#fff url(../images/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.waitpage{position:absolute;top:0;left:0;opacity:.7;background:#ababab url(../../images/loading1.gif)center no-repeat;z-index:10000}.divpre img{max-width:150px;max-height:100px}.divpre{overflow:hidden}.autoinput{padding-left:6px;width:90%}.bodytitle{margin:auto;width:98%;height:28px;border:1px dotted #BFD67C;background:url(../images/wbg.gif)}.bodytitle div{float:left}.bodytitletxt{padding-left:6px;line-height:28px}.tbtitle td{padding:6px}.tblist td{padding:6px;background:#fff}.tblist td.tbsname{padding:6px;background:#F9FFE6}.colordlg{padding:.25rem .5rem;width:100px;line-height:160%;border:2px dashed #008E38;background:#F0FAEB;z-index:10005}option.alltype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(../images/arrr.gif)10px 4px no-repeat}.ilist{border-top:1px dashed #eee;border-bottom:1px dashed #eee;border-left:1px dashed #eee}.ilist td{border-right:1px dashed #eee}#typeid2{padding:0;float:left;height:18px;font-size:12px;background:url(../images/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:85px;height:20px;opacity:0;cursor:pointer}.litpic_span{margin-left:-60px;width:76px;height:22px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate{padding-left:30px;background:url(../images/calendar.gif)10px no-repeat}#title{background:url(../images/ruler.gif)repeat-x 0px 10px}.spec{width:60px}.gtab a{display:block;float:left;width:80px;height:26px;line-height:26px;text-align:center}.albCt img{cursor:pointer}.maintable{width:98%!important;border:1px solid #dee2e6}span.page-link{color:#fff;background:#28a745}a.btn{color:white!important}.btn-success{background:#28a745;border-color:#28a745}.table{color:#424b51}.table td,.table th{padding:.6rem;vertical-align:middle}.table th img,.table td img{vertical-align:text-bottom} \ No newline at end of file diff --git a/src/dede/dialog/select_images_post.php b/src/dede/dialog/select_images_post.php index 61b42cc4..41785a1e 100755 --- a/src/dede/dialog/select_images_post.php +++ b/src/dede/dialog/select_images_post.php @@ -34,14 +34,14 @@ $CKEditorFuncNum = (isset($CKEditorFuncNum)) ? $CKEditorFuncNum : 1; $imgfile_name = trim(preg_replace("#[ \r\n\t\*\%\\\/\?><\|\":]{1,}#", '', $imgfile_name)); if (!preg_match("#\.(".$cfg_imgtype.")#i", $imgfile_name)) { - ShowMsg("您所上传的图片类型不在许可列表,请更改系统对扩展名限定的配置!", "-1"); + ShowMsg("您所上传的图片类型不在许可列表,请更改系统对扩展名限定的配置", "-1"); exit(); } $nowtme = time(); $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp"); $imgfile_type = strtolower(trim($imgfile_type)); if (!in_array($imgfile_type, $sparr)) { - ShowMsg("上传的图片格式错误,请使用JPEG、GIF、PNG、WBMP格式的其中一种!", "-1"); + ShowMsg("上传的图片格式错误,请使用JPEG、GIF、PNG、WBMP格式的其中一种", "-1"); exit(); } $mdir = MyDate($cfg_addon_savetype, $nowtme); @@ -55,7 +55,7 @@ $fs = explode('.', $imgfile_name); $filename = $filename.'.'.$fs[count($fs) - 1]; $filename_name = $filename_name.'.'.$fs[count($fs) - 1]; $fullfilename = $cfg_basedir.$activepath."/".$filename; -move_uploaded_file($imgfile, $fullfilename) or die("上传文件到 $fullfilename 失败!"); +move_uploaded_file($imgfile, $fullfilename) or die("上传文件到 $fullfilename 失败"); @unlink($imgfile); if (empty($resize)) { @@ -93,8 +93,8 @@ if ($GLOBALS['cfg_html_editor'] == 'ckeditor' && $CKUpload) { if (!empty($noeditor)) { - ShowMsg("成功上传一幅图片!", "select_images.php?imgstick=$imgstick&comeback=".urlencode($filename_name)."&v=$v&f=$f&CKEditorFuncNum=$CKEditorFuncNum&noeditor=yes&activepath=".urlencode($activepath)."/$mdir&d=".time()); + ShowMsg("成功上传一幅图片", "select_images.php?imgstick=$imgstick&comeback=".urlencode($filename_name)."&v=$v&f=$f&CKEditorFuncNum=$CKEditorFuncNum&noeditor=yes&activepath=".urlencode($activepath)."/$mdir&d=".time()); } else { - ShowMsg("成功上传一幅图片!", "select_images.php?imgstick=$imgstick&comeback=".urlencode($filename_name)."&v=$v&f=$f&CKEditorFuncNum=$CKEditorFuncNum&activepath=".urlencode($activepath)."/$mdir&d=".time()); + ShowMsg("成功上传一幅图片", "select_images.php?imgstick=$imgstick&comeback=".urlencode($filename_name)."&v=$v&f=$f&CKEditorFuncNum=$CKEditorFuncNum&activepath=".urlencode($activepath)."/$mdir&d=".time()); } exit(); diff --git a/src/dede/dialog/select_soft.php b/src/dede/dialog/select_soft.php index e799ae6d..e2f00d5a 100644 --- a/src/dede/dialog/select_soft.php +++ b/src/dede/dialog/select_soft.php @@ -122,7 +122,7 @@ table{background:#fff} else if ($file == "..") { if ($activepath == "") continue; $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath); - $line = "\n
上级目录 当前目录:$activepath
$file
$file $filesize KB $filetime
$file $filesize KB $filetime
- + - + \r\n"; diff --git a/src/dede/friendlink_edit.php b/src/dede/friendlink_edit.php index 65af1de8..6fc26cac 100755 --- a/src/dede/friendlink_edit.php +++ b/src/dede/friendlink_edit.php @@ -24,7 +24,7 @@ if (isset($allid)) { if ($dopost == "delete") { $id = preg_replace("#[^0-9]#", "", $id); $dsql->ExecuteNoneQuery("DELETE FROM `#@__flink` WHERE id='$id'"); - ShowMsg("成功删除一个链接!", $ENV_GOBACK_URL); + ShowMsg("成功删除一个链接", $ENV_GOBACK_URL); exit(); } else if ($dopost == "delall") { $aids = explode(',', $aids); @@ -33,10 +33,10 @@ if ($dopost == "delete") { $aid = preg_replace("#[^0-9]#", "", $aid); $dsql->ExecuteNoneQuery("DELETE FROM `#@__flink` WHERE id='$aid'"); } - ShowMsg("成功删除指定链接!", $ENV_GOBACK_URL); + ShowMsg("成功删除指定链接", $ENV_GOBACK_URL); exit(); } else { - ShowMsg("您没选定任何链接!", $ENV_GOBACK_URL); + ShowMsg("您没选定任何链接", $ENV_GOBACK_URL); exit(); } } else if ($dopost == "saveedit") { @@ -61,7 +61,7 @@ if ($dopost == "delete") { $query = "UPDATE `#@__flink` SET sortrank='$sortrank',url='$url',webname='$webname',logo='$logo',msg='$msg', email='$email',typeid='$typeid',ischeck='$ischeck' WHERE id='$id' "; $dsql->ExecuteNoneQuery($query); - ShowMsg("成功更改一个链接!", $ENV_GOBACK_URL); + ShowMsg("成功更改一个链接", $ENV_GOBACK_URL); exit(); } $myLink = $dsql->GetOne("SELECT #@__flink.*,#@__flinktype.typename FROM #@__flink LEFT JOIN #@__flinktype ON #@__flink.typeid=#@__flinktype.id WHERE #@__flink.id=$id"); diff --git a/src/dede/friendlink_type.php b/src/dede/friendlink_type.php index 0aae026a..41306b7b 100755 --- a/src/dede/friendlink_type.php +++ b/src/dede/friendlink_type.php @@ -36,7 +36,7 @@ if ($dopost == "save") { $dsql->ExecuteNoneQuery($query); } header("Content-Type: text/html; charset={$cfg_soft_lang}"); - echo ""; + echo ""; } include DedeInclude('templets/friendlink_type.htm'); diff --git a/src/dede/imagecut.php b/src/dede/imagecut.php index 7cf0f234..71dea396 100755 --- a/src/dede/imagecut.php +++ b/src/dede/imagecut.php @@ -13,7 +13,7 @@ require_once(dirname(__FILE__).'/config.php'); $action = isset($action) ? trim($action) : ''; if (empty($action)) { if (!@is_file($cfg_basedir.$file)) { - ShowMsg("对不起,必须选择站内的图片才能进行裁剪!
点击'站内选择', 上传或选择一个图片,然后才能进行裁剪!", "./dialog/select_images.php?f=form1.picname&imgstick=small", 0, 10000); + ShowMsg("对不起,必须选择站内的图片才能进行裁剪
点击'站内选择', 上传或选择一个图片,然后才能进行裁剪", "./dialog/select_images.php?f=form1.picname&imgstick=small", 0, 10000); exit(); } include DEDEADMIN.'/templets/imagecut.htm'; @@ -22,15 +22,15 @@ if (empty($action)) { require_once(DEDEINC.'/image.func.php'); if (!@is_file($cfg_basedir.$file)) { - ShowMsg('对不起,请重新选择裁剪图片!', '-1'); + ShowMsg('对不起,请重新选择裁剪图片', '-1'); exit(); } if (empty($width)) { - ShowMsg('对不起,请选择裁剪图片的尺寸!', '-1'); + ShowMsg('对不起,请选择裁剪图片的尺寸', '-1'); exit(); } if (empty($height)) { - ShowMsg('对不起,请选择裁剪图片的尺寸!', '-1'); + ShowMsg('对不起,请选择裁剪图片的尺寸', '-1'); exit(); } $imginfo = getimagesize($cfg_basedir.$file); @@ -54,7 +54,7 @@ if (empty($action)) { $source = imagecreatefrompng($srcFile); break; default: - ShowMsg('对不起,裁剪图片类型不支持请选择其他类型图片!', '-1'); + ShowMsg('对不起,裁剪图片类型不支持请选择其他类型图片', '-1'); break; } @@ -87,7 +87,7 @@ if (empty($action)) { imagepng($thumba, $ddpicokurl); break; default: - ShowMsg("对不起,裁剪图片类型不支持请选择其他类型图片!", "-1"); + ShowMsg("对不起,裁剪图片类型不支持请选择其他类型图片", "-1"); break; } diff --git a/src/dede/inc/inc_action_info.php b/src/dede/inc/inc_action_info.php index 5151d9a0..eb5a3c7e 100755 --- a/src/dede/inc/inc_action_info.php +++ b/src/dede/inc/inc_action_info.php @@ -425,7 +425,7 @@ $actionSearch[10] = array( ), 9 => array( 'title' => '随机模板设置', - 'description' => '本设置仅适用于系统默认的文章模型,设置后发布文章时会自动按指定的模板随机获取一个,如果不想使用此功能,把它设置为空即可!', + 'description' => '本设置仅适用于系统默认的文章模型,设置后发布文章时会自动按指定的模板随机获取一个,如果不想使用此功能,把它设置为空即可', 'purview' => 'sys_StringMix', 'linkurl' => 'article_template_rand.php' ), diff --git a/src/dede/inc/inc_archives_functions.php b/src/dede/inc/inc_archives_functions.php index d06ef796..5c3587c9 100755 --- a/src/dede/inc/inc_archives_functions.php +++ b/src/dede/inc/inc_archives_functions.php @@ -380,7 +380,7 @@ function GetDDImage($litpic, $picname, $isremote) $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png"); $_FILES[$litpic]['type'] = strtolower(trim($_FILES[$litpic]['type'])); if (!in_array($_FILES[$litpic]['type'], $sparr)) { - ShowMsg("上传的图片格式错误,请使用JPEG、GIF、PNG格式的其中一种!", "-1"); + ShowMsg("上传的图片格式错误,请使用JPEG、GIF、PNG格式的其中一种", "-1"); exit(); } $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); @@ -695,7 +695,7 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '') $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png"); $_FILES[$upname]['type'] = strtolower(trim($_FILES[$upname]['type'])); if (!in_array($_FILES[$upname]['type'], $sparr)) { - ShowMsg("上传的图片格式错误,请使用JPEG、GIF、PNG格式的其中一种!", "-1"); + ShowMsg("上传的图片格式错误,请使用JPEG、GIF、PNG格式的其中一种", "-1"); exit(); } if (!empty($handurl) && !preg_match("#^http:\/\/#i", $handurl) && file_exists($cfg_basedir.$handurl)) { diff --git a/src/dede/index_body.php b/src/dede/index_body.php index b5e06b05..a8faf932 100755 --- a/src/dede/index_body.php +++ b/src/dede/index_body.php @@ -92,7 +92,7 @@ else if ($dopost == 'editshow') {
IDID 列表名称 模板文件点击点击 创建时间 管理
- - +
+
修改快捷操作项
diff --git a/src/dede/index_testenv.php b/src/dede/index_testenv.php index 3880fa44..169e4785 100755 --- a/src/dede/index_testenv.php +++ b/src/dede/index_testenv.php @@ -140,10 +140,10 @@ if ($rs < 0) { $linkurl = "马上修改"; switch ($rs) { case -1: - $msg = "没有更改默认管理员名称admin,建议您修改为其他管理账号!{$linkurl}"; + $msg = "没有更改默认管理员名称admin,建议您修改为其他管理账号{$linkurl}"; break; case -2: - $msg = "没有更改默认的管理员名称和密码,强烈建议您进行更改!{$linkurl}"; + $msg = "没有更改默认的管理员名称和密码,强烈建议您进行更改{$linkurl}"; break; } $safeMsg[] = $msg; diff --git a/src/dede/js/album.js b/src/dede/js/album.js index f4ad0895..43103b9a 100755 --- a/src/dede/js/album.js +++ b/src/dede/js/album.js @@ -11,11 +11,11 @@ function checkSubmitAlb() { if (document.form1.title.value == '') { - ShowMsg("档案标题不能为空!"); + ShowMsg("档案标题不能为空"); return false; } if (document.form1.typeid.value == 0) { - ShowMsg("请选择档案的主类别!"); + ShowMsg("请选择档案的主类别"); return false; } document.form1.imagebody.value = $Obj('copyhtml').innerHTML; @@ -69,7 +69,7 @@ function showZipField(formitem, zipid, upid) { //图集,显示与隐藏Html编辑框 function showHtmlField(formitem, htmlid, upid) { if ($Nav() != "IE") { - alert("该方法不适用于非IE浏览器!"); + alert("该方法不适用于非IE浏览器"); return; } if (formitem.checked) { diff --git a/src/dede/js/handlers.js b/src/dede/js/handlers.js index eb99aa58..53937d89 100755 --- a/src/dede/js/handlers.js +++ b/src/dede/js/handlers.js @@ -13,7 +13,7 @@ function fileQueueError(file, errorCode, message) { var imageName = "error.gif"; var errorName = ""; if (errorCode === SWFUpload.errorCode_QUEUE_LIMIT_EXCEEDED) { - errorName = "您添加的文件超过了限制!"; + errorName = "您添加的文件超过了限制"; } if (errorName !== "") { @@ -79,7 +79,7 @@ function uploadSuccess(file, serverData) { progress.toggleCancel(false); } else { addImage("images/error.gif", 0); - progress.setStatus("有错误!"); + progress.setStatus("有错误"); progress.toggleCancel(false); alert(serverData); diff --git a/src/dede/js/list.js b/src/dede/js/list.js index 80568552..146778e3 100755 --- a/src/dede/js/list.js +++ b/src/dede/js/list.js @@ -12,7 +12,7 @@ function kwArc(aid){ if(aid==0) aid = getOneItem(); if(qstr=='') { - ShowMsg('必须选择一个或多个文档!'); + ShowMsg('必须选择一个或多个文档'); return; } location="archives_do.php?aid="+aid+"&dopost=makekw&qstr="+qstr; @@ -35,7 +35,7 @@ function moveArc(e, obj, cid){ var qstr=getCheckboxItem(); if(qstr=='') { - ShowMsg('必须选择一个或多个文档!'); + ShowMsg('必须选择一个或多个文档'); return; } LoadQuickDiv(e, 'archives_do.php?dopost=moveArchives&qstr='+qstr+'&channelid='+cid+'&rnd='+Math.random(), 'moveArchives', '450px', '180px'); @@ -53,7 +53,7 @@ function cAtts(jname, e, obj) var screeheight = document.body.clientHeight + 20; if(qstr=='') { - ShowMsg('必须选择一个或多个文档!'); + ShowMsg('必须选择一个或多个文档'); return; } LoadQuickDiv(e, 'archives_do.php?dopost=attsDlg&qstr='+qstr+'&dojob='+jname+'&rnd='+Math.random(), 'attsDlg', '450px', '160px'); @@ -85,7 +85,7 @@ function ShowMenu(evt,obj,aid,atitle) new ContextItem("推荐文档",function(){ adArc(aid); }), new ContextItem("删除文档",function(){ delArc(aid); }), new ContextSeperator(), - new ContextItem("复制(C)",function(){ copyToClipboard(atitle); }), + new ContextItem("复制(C)",function(){ copyToClipboard(atitle); }), new ContextItem("重载页面",function(){ location.reload(); }), new ContextSeperator(), new ContextItem("全部选择",function(){ selAll(); }), diff --git a/src/dede/js/main.js b/src/dede/js/main.js index 44c91440..ea5f876e 100755 --- a/src/dede/js/main.js +++ b/src/dede/js/main.js @@ -496,7 +496,7 @@ function copyToClipboard(txt) { try { netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); } catch (e) { - alert("被浏览器拒绝!\n请在浏览器地址栏输入'about:config'并回车\n然后将'signed.applets.codebase_principal_support'设置为'true'"); + alert("被浏览器拒绝\n请在浏览器地址栏输入'about:config'并回车\n然后将'signed.applets.codebase_principal_support'设置为'true'"); } var clip = Components.classes['@mozilla.org/widget/clipboard;1'].createInstance(Components.interfaces.nsIClipboard); if (!clip) return; @@ -558,7 +558,7 @@ function getSelCat(targetId) { } } if (selvalue == '') { - alert('你没有选中任何项目!'); + alert('您没有选中任何项目'); return; } if (targetObj) { diff --git a/src/dede/log_edit.php b/src/dede/log_edit.php index 45758cfe..4dca70f1 100755 --- a/src/dede/log_edit.php +++ b/src/dede/log_edit.php @@ -12,14 +12,14 @@ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_Log'); if (empty($dopost)) { - ShowMsg("您没指定任何参数!", "javascript:;"); + ShowMsg("您没指定任何参数", "javascript:;"); exit(); } //清空所有日志 if ($dopost == "clear") { $dsql->ExecuteNoneQuery("DELETE FROM #@__log"); - ShowMsg("成功清空所有日志!", "log_list.php"); + ShowMsg("成功清空所有日志", "log_list.php"); exit(); } else if ($dopost == "del") { $bkurl = isset($_COOKIE['ENV_GOBACK_URL']) ? $_COOKIE['ENV_GOBACK_URL'] : "log_list.php"; @@ -34,9 +34,9 @@ if ($dopost == "clear") { } if ($dquery != "") $dquery = " where ".$dquery; $dsql->ExecuteNoneQuery("DELETE FROM #@__log $dquery"); - ShowMsg("成功删除指定的日志!", $bkurl); + ShowMsg("成功删除指定的日志", $bkurl); exit(); } else { - ShowMsg("无法识别您的请求!", "javascript:;"); + ShowMsg("无法识别您的请求", "javascript:;"); exit(); } diff --git a/src/dede/login.php b/src/dede/login.php index 929894b8..77d8e960 100755 --- a/src/dede/login.php +++ b/src/dede/login.php @@ -16,7 +16,7 @@ $gotopage = RemoveXSS($gotopage); //检测安装目录安全性 if (is_dir(dirname(__FILE__).'/../install')) { if (!file_exists(dirname(__FILE__).'/../install/install_lock.txt')) { - $fp = fopen(dirname(__FILE__).'/../install/install_lock.txt', 'w') or die('安装目录无写入权限,无法进行写入锁定文件,请安装完毕删除安装目录!'); + $fp = fopen(dirname(__FILE__).'/../install/install_lock.txt', 'w') or die('安装目录无写入权限,无法进行写入锁定文件,请安装完毕删除安装目录'); fwrite($fp, 'ok'); fclose($fp); } @@ -39,7 +39,7 @@ require_once(DEDEDATA.'/admin/config_update.php'); //检测后台目录是否更名 $cururl = GetCurUrl(); if (preg_match('/dede\/login/i', $cururl)) { - $redmsg = ''; + $redmsg = ''; } else { $redmsg = ''; } diff --git a/src/dede/mail_file_manage.php b/src/dede/mail_file_manage.php index 4908a670..0823b324 100755 --- a/src/dede/mail_file_manage.php +++ b/src/dede/mail_file_manage.php @@ -8,7 +8,7 @@ if($fmdo=="del") $filename = $cfg_basedir.$activepath."/$filename"; @unlink($filename); $t="文件"; - ShowMsg("成功删除一个".$t."!","mail_file_manage.php"); + ShowMsg("成功删除一个".$t."","mail_file_manage.php"); }else{ if(!isset($activepath)){ $activepath=$cfg_cmspath; diff --git a/src/dede/mail_title.php b/src/dede/mail_title.php index 5398c6ce..74a588d1 100755 --- a/src/dede/mail_title.php +++ b/src/dede/mail_title.php @@ -48,10 +48,10 @@ if($dopost=="add"){ $mid=$cuserLogin->getUserID(); $query = "INSERT INTO #@__mail_title (period,typeid,title,content,addtime,sendtime,writer,mid,state,count) VALUES ('$period','$typeid','$title','$message','$addtime',0,'$writer','$mid',0,0)"; if(!$dsql->ExecuteNoneQuery($query)){ - ShowMsg("更新数据库#@__mail_title表时出错,请检查!","javascript:;"); + ShowMsg("更新数据库#@__mail_title表时出错,请检查","javascript:;"); exit(); }else{ - ShowMsg("发表期刊成功!","mail_title.php"); + ShowMsg("发表期刊成功","mail_title.php"); exit(); } }elseif($dopost=="editsave"){ @@ -76,15 +76,15 @@ if($dopost=="add"){ $query = "UPDATE #@__mail_title SET period='$period',typeid='$typeid',title='$title',content='$message',writer='$writer',mid='$mid' WHERE id=$id"; if(!$dsql->ExecuteNoneQuery($query)){ - ShowMsg("更新数据库#@__mail_title表时出错,请检查!","javascript:;"); + ShowMsg("更新数据库#@__mail_title表时出错,请检查","javascript:;"); exit(); }else{ - ShowMsg("编辑期刊成功!","mail_title.php"); + ShowMsg("编辑期刊成功","mail_title.php"); exit(); } }elseif($dopost=="delete"){ $dsql->ExecuteNoneQuery("Delete From `#@__mail_title` where id='$id'"); - ShowMsg("删除期刊成功!","mail_title.php"); + ShowMsg("删除期刊成功","mail_title.php"); exit(); }else{ diff --git a/src/dede/mail_type.php b/src/dede/mail_type.php index 06da12e8..0f057c01 100755 --- a/src/dede/mail_type.php +++ b/src/dede/mail_type.php @@ -19,10 +19,10 @@ if($dopost=="add"){ $query = "INSERT INTO #@__mail_type (typename,description) VALUES ('$typename','$description')"; if(!$dsql->ExecuteNoneQuery($query)){ - ShowMsg("更新数据库#@__mail_type表时出错,请检查!","javascript:;"); + ShowMsg("更新数据库#@__mail_type表时出错,请检查","javascript:;"); exit(); }else{ - ShowMsg("添加分类成功!","mail_type.php"); + ShowMsg("添加分类成功","mail_type.php"); exit(); } }elseif($dopost=="editsave"){ @@ -35,15 +35,15 @@ if($dopost=="add"){ $query = "UPDATE #@__mail_type SET typename='$typename',description='$description' WHERE id=$id"; if(!$dsql->ExecuteNoneQuery($query)){ - ShowMsg("更新数据库#@__mail_type表时出错,请检查!","javascript:;"); + ShowMsg("更新数据库#@__mail_type表时出错,请检查","javascript:;"); exit(); }else{ - ShowMsg("更改分类成功!","mail_type.php"); + ShowMsg("更改分类成功","mail_type.php"); exit(); } }elseif($dopost=="delete"){ $dsql->ExecuteNoneQuery("Delete From `#@__mail_type` where id='$id'"); - ShowMsg("删除分类成功!","mail_type.php"); + ShowMsg("删除分类成功","mail_type.php"); exit(); }else{ $sql = "SELECT * FROM `#@__mail_type` ORDER BY id "; diff --git a/src/dede/makehtml_all.php b/src/dede/makehtml_all.php index 49464931..6ad70d2f 100755 --- a/src/dede/makehtml_all.php +++ b/src/dede/makehtml_all.php @@ -28,7 +28,7 @@ if ($action == '') { $starttime = GetMkTime($starttime); $mkvalue = ($uptype == 'time' ? $starttime : $startid); OptimizeData($dsql); - ShowMsg("完成数据优化,现在开始更新文档!", "makehtml_all.php?action=make&step=2&uptype=$uptype&mkvalue=$mkvalue"); + ShowMsg("完成数据优化,现在开始更新文档", "makehtml_all.php?action=make&step=2&uptype=$uptype&mkvalue=$mkvalue"); exit(); } //更新文档 @@ -57,7 +57,7 @@ if ($action == '') { } else { if (file_exists($homeFile)) echo "启用静态生成,建议删除"+$homeFile; } - ShowMsg("完成更新所有文档,现在开始更新栏目页!", "makehtml_all.php?action=make&step=4&uptype=$uptype&mkvalue=$mkvalue"); + ShowMsg("完成更新所有文档,现在开始更新栏目页", "makehtml_all.php?action=make&step=4&uptype=$uptype&mkvalue=$mkvalue"); exit(); } //更新栏目 @@ -69,7 +69,7 @@ if ($action == '') { $adminID = $cuserLogin->getUserID(); $mkcachefile = DEDEDATA."/mkall_cache_{$adminID}.php"; if ($uptype == 'all' || empty($mkvalue)) { - ShowMsg("不需要进行初处理,现更新所有栏目!", "makehtml_list_action.php?gotype=mkallct"); + ShowMsg("不需要进行初处理,现更新所有栏目", "makehtml_list_action.php?gotype=mkallct"); exit(); } else { if ($uptype == 'time') { @@ -96,7 +96,7 @@ if ($action == '') { } } } - $fp = fopen($mkcachefile, 'w') or die("无法写入缓存文件:{$mkcachefile} 所以无法更新栏目!"); + $fp = fopen($mkcachefile, 'w') or die("无法写入缓存文件:{$mkcachefile} 所以无法更新栏目"); if (count($typeidsok) > 0) { fwrite($fp, "<"."?php\r\n"); $i = -1; @@ -108,11 +108,11 @@ if ($action == '') { } fwrite($fp, "?".">"); fclose($fp); - ShowMsg("完成栏目缓存处理,现转向更新栏目!", "makehtml_list_action.php?gotype=mkall"); + ShowMsg("完成栏目缓存处理,现转向更新栏目", "makehtml_list_action.php?gotype=mkall"); exit(); } else { fclose($fp); - ShowMsg("没有可更新的栏目,现在作最后数据优化!", "makehtml_all.php?action=make&step=10"); + ShowMsg("没有可更新的栏目,现在作最后数据优化", "makehtml_all.php?action=make&step=10"); exit(); } } @@ -124,7 +124,7 @@ if ($action == '') { $mkcachefile = DEDEDATA."/mkall_cache_{$adminID}.php"; @unlink($mkcachefile); OptimizeData($dsql); - ShowMsg("完成所有文件的更新!", "javascript:;"); + ShowMsg("完成所有文件的更新", "javascript:;"); exit(); } //make step diff --git a/src/dede/makehtml_archives_action.php b/src/dede/makehtml_archives_action.php index b2a19eb2..62cca07e 100755 --- a/src/dede/makehtml_archives_action.php +++ b/src/dede/makehtml_archives_action.php @@ -118,7 +118,7 @@ if ($tjnum < $totalnum) { ShowMsg("生成文件:$totalnum 总用时:{$ttime} 分钟,现转向当前栏目更新>>", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1"); } else { if ($uptype == '') { - ShowMsg("完成所有创建任务!,生成文件:$totalnum 总用时:{$ttime} 分钟。", "javascript:;"); + ShowMsg("完成所有创建任务,生成文件:$totalnum 总用时:{$ttime} 分钟。", "javascript:;"); } else { ShowMsg("完成文档HTML更新任务,现在开始进行主页更新...", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue"); } diff --git a/src/dede/makehtml_freelist_action.php b/src/dede/makehtml_freelist_action.php index 1c737b85..9fbd1681 100755 --- a/src/dede/makehtml_freelist_action.php +++ b/src/dede/makehtml_freelist_action.php @@ -29,7 +29,7 @@ $totalpage = count($idArray); if (isset($idArray[$pageno])) { $lid = $idArray[$pageno]; } else { - ShowMsg("完成所有文件创建!", 'javascript:;'); + ShowMsg("完成所有文件创建", 'javascript:;'); exit(); } $lv = new FreeList($lid); @@ -52,11 +52,11 @@ if ($ntotalpage <= $maxpagesize) { $lv->Close(); $nextpage = $pageno + 1; if ($nextpage == $totalpage) { - ShowMsg("完成所有文件创建!", 'javascript:;'); + ShowMsg("完成所有文件创建", 'javascript:;'); } else { if ($finishType) { $gourl = "makehtml_freelist_action.php?maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$nextpage"; - ShowMsg("成功创建列表:".$tid.",继续进行操作!", $gourl, 0, 100); + 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); diff --git a/src/dede/makehtml_js_action.php b/src/dede/makehtml_js_action.php index 2dcf22d8..85b7365a 100755 --- a/src/dede/makehtml_js_action.php +++ b/src/dede/makehtml_js_action.php @@ -21,14 +21,14 @@ if ($uptype == "all") { $row = $dsql->GetOne("SELECT id FROM `#@__arctype` WHERE id>'$typeid' AND ispart<>2 ORDER BY id ASC LIMIT 0,1;"); if (!is_array($row)) { echo ""; - echo "
完成所有文件更新!
"; + echo "
完成所有文件更新
"; exit(); } else { $pv = new PartView($row['id']); $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet); $pv->SaveToHtml($cfg_basedir.$cfg_cmspath."/data/js/".$row['id'].".js", 0); $typeid = $row['id'];; - ShowMsg("成功更新".$cfg_cmspath."/data/js/".$row['id'].".js,继续进行操作!", "makehtml_js_action.php?typeid=$typeid", 0, 100); + ShowMsg("成功更新".$cfg_cmspath."/data/js/".$row['id'].".js,继续进行操作", "makehtml_js_action.php?typeid=$typeid", 0, 100); exit(); } } else { @@ -36,7 +36,7 @@ if ($uptype == "all") { $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet); $pv->SaveToHtml($cfg_basedir.$cfg_cmspath."/data/js/".$typeid.".js", 0); echo ""; - echo "
成功更新".$cfg_cmspath."/data/js/".$typeid.".js!"; + echo "
成功更新".$cfg_cmspath."/data/js/".$typeid.".js"; echo "预览:
"; echo "
"; echo ""; diff --git a/src/dede/makehtml_list_action.php b/src/dede/makehtml_list_action.php index 81095eca..047d150b 100755 --- a/src/dede/makehtml_list_action.php +++ b/src/dede/makehtml_list_action.php @@ -52,10 +52,10 @@ if (isset($idArray[$pageno])) { $tid = $idArray[$pageno]; } else { if ($gotype == '') { - ShowMsg("完成所有列表更新!", "javascript:;"); + ShowMsg("完成所有列表更新", "javascript:;"); exit(); } else if ($gotype == 'mkall' || $gotype == 'mkallct') { - ShowMsg("完成所有栏目列表更新,现在作最后数据优化!", "makehtml_all.php?action=make&step=10"); + ShowMsg("完成所有栏目列表更新,现在作最后数据优化", "makehtml_all.php?action=make&step=10"); exit(); } } @@ -103,16 +103,16 @@ if ($nextpage >= $totalpage && $finishType) { if (empty($reurl)) { $reurl = '../plus/list.php?tid='.$tid; } - ShowMsg("完成所有栏目列表更新!浏览栏目", "javascript:;"); + ShowMsg("完成所有栏目列表更新浏览栏目", "javascript:;"); exit(); } else if ($gotype == 'mkall' || $gotype == 'mkallct') { - ShowMsg("完成所有栏目列表更新,现在作最后数据优化!", "makehtml_all.php?action=make&step=10"); + ShowMsg("完成所有栏目列表更新,现在作最后数据优化", "makehtml_all.php?action=make&step=10"); exit(); } } else { if ($finishType) { $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$nextpage"; - ShowMsg("成功创建栏目:".$tid.",继续进行操作!", $gourl, 0, 100); + ShowMsg("成功创建栏目:".$tid.",继续进行操作", $gourl, 0, 100); exit(); } else { $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&mkpage=$mkpage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$pageno"; diff --git a/src/dede/makehtml_rss_action.php b/src/dede/makehtml_rss_action.php index e9c02365..3c4dda57 100755 --- a/src/dede/makehtml_rss_action.php +++ b/src/dede/makehtml_rss_action.php @@ -19,10 +19,10 @@ 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); $tid = $row['id']; - ShowMsg("成功更新".$rssurl.",继续进行操作!", "makehtml_rss_action.php?tid=$tid&maxrecord=$maxrecord", 0, 100); + ShowMsg("成功更新".$rssurl.",继续进行操作", "makehtml_rss_action.php?tid=$tid&maxrecord=$maxrecord", 0, 100); } diff --git a/src/dede/makehtml_spec.php b/src/dede/makehtml_spec.php index 1fa952b4..3ce0a80e 100755 --- a/src/dede/makehtml_spec.php +++ b/src/dede/makehtml_spec.php @@ -18,7 +18,7 @@ if ($dopost == "ok") { $sp = new SpecView(); $rurl = $sp->MakeHtml(0); echo ""; - echo "
成功生成所有专题HTML列表!预览
"; + echo "
成功生成所有专题HTML列表预览
"; exit(); } include DedeInclude('templets/makehtml_spec.htm'); diff --git a/src/dede/makehtml_taglist_action.php b/src/dede/makehtml_taglist_action.php index 0ed2cca6..86d03be0 100644 --- a/src/dede/makehtml_taglist_action.php +++ b/src/dede/makehtml_taglist_action.php @@ -41,7 +41,7 @@ if ($upall == 1 && $ctagid == 0) { if ($ctagid == 0 && $allfinish) { $reurl = '../a/tags/'; - ShowMsg("完成TAG更新!浏览TAG首页", "javascript:;"); + ShowMsg("完成TAG更新浏览TAG首页", "javascript:;"); exit; } @@ -72,7 +72,7 @@ if (is_array($tag) && count($tag) > 0) { $dlist->MakeHtml(1, 10); $reurl = '../a/tags/'; if ($upall == 1) { - ShowMsg("完成TAG更新!浏览TAG首页", "javascript:;"); + ShowMsg("完成TAG更新浏览TAG首页", "javascript:;"); } else { $query = "UPDATE `#@__tagindex` SET mktime=uptime WHERE id='$ctagid' "; $dsql->ExecuteNoneQuery($query); @@ -82,7 +82,7 @@ if (is_array($tag) && count($tag) > 0) { } $reurl .= $tag['tag_pinyin']; - ShowMsg("完成TAG更新:[".$tag['tag']."]!浏览TAG首页", "javascript:;"); + ShowMsg("完成TAG更新:[".$tag['tag']."]浏览TAG首页", "javascript:;"); } exit(); } else { @@ -95,7 +95,7 @@ if (is_array($tag) && count($tag) > 0) { $nextpage = 0; } $gourl = "makehtml_taglist_action.php?maxpagesize=$maxpagesize&tagid=$tagid&pageno=$nextpage&upall=$upall&ctagid=$ctagid"; - ShowMsg("成功生成TAG:[".$tag['tag']."],继续进行操作!", $gourl, 0, 100); + ShowMsg("成功生成TAG:[".$tag['tag']."],继续进行操作", $gourl, 0, 100); exit(); } else { // 继续当前这个 diff --git a/src/dede/mda_main.php b/src/dede/mda_main.php index ba1c8c29..0f7e9f56 100755 --- a/src/dede/mda_main.php +++ b/src/dede/mda_main.php @@ -83,7 +83,7 @@ function __link(){ } -------------------------------*/ if ($dopost == 'place' or $dopost == 'report' or $dopost == 'account' or $dopost == 'setting') { if (!mda_islogin()) { - ShowMsg("您尚未登录德得广告,请先登录后继续使用……!", '?dopost=login'); + ShowMsg("您尚未登录德得广告,请先登录后继续使用……", '?dopost=login'); exit(); } mda_check_islogin(); @@ -161,7 +161,7 @@ function __bind_user(){ } $domain = isset($domain) ? $domain : ''; $channel_name = isset($channel_name) ? $channel_name : ''; if (!$email or !$pwd or !$domain or !$channel_name) { - ShowMsg("填写正确的账号信息!", -1); + ShowMsg("填写正确的账号信息", -1); exit(); } if ($cfg_soft_lang == 'gb2312') $channel_name = gb2utf8($channel_name); @@ -173,7 +173,7 @@ function __bind_user(){ } ); $rs = json_decode(mda_http_send(MDA_API_BIND_USER, 0, $paramsArr), TRUE); if (!$rs) { - ShowMsg("请求API错误,请重试!", -1); + ShowMsg("请求API错误,请重试", -1); exit(); } if ($rs['code'] != 0) { @@ -272,7 +272,7 @@ function __main(){ }
您已成功登录德得广告!您可以进行以下操作:您已成功登录德得广告您可以进行以下操作:
@@ -328,7 +328,7 @@ EOT; ); $rs = json_decode(mda_http_send(MDA_API_LOGIN, 0, $paramsArr), TRUE); if (!$rs) { - ShowMsg("请求API错误,请重试!", -1); + ShowMsg("请求API错误,请重试", -1); exit(); } if ($rs['code'] != 0) { @@ -336,7 +336,7 @@ EOT; exit(); } if ($rs['code'] == 0) { - ShowMsg("Channel Secret 修改成功……!", '?dopost=main'); + ShowMsg("Channel Secret 修改成功……", '?dopost=main'); mda_set_setting('channel_secret', $channel_secret); } } @@ -417,7 +417,7 @@ function __index(){ }
- + diff --git a/src/dede/media_add.php b/src/dede/media_add.php index ee13cc8d..7d9e11b1 100755 --- a/src/dede/media_add.php +++ b/src/dede/media_add.php @@ -62,7 +62,7 @@ if ($dopost == "upload") { 漏洞描述:dedecms早期版本后台存在大量的富文本编辑器,该控件提供了一些文件上传接口,同时dedecms对上传文件的后缀类型未进行严格的限制,这导致了黑客可以上传WEBSHELL,获取网站后台权限。 */ if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)[^a-zA-Z0-9]+$#i', trim($filename))) { - ShowMsg("您指定的文件名被系统禁止!", "javascript:;"); + ShowMsg("您指定的文件名被系统禁止", "javascript:;"); exit(); } $fullfilename = $cfg_basedir.$filename; @@ -87,7 +87,7 @@ if ($dopost == "upload") { $dsql->ExecuteNoneQuery($inquery); } } - ShowMsg("成功上传 {$okdd} 个文件!", "media_main.php"); + ShowMsg("成功上传 {$okdd} 个文件", "media_main.php"); exit(); } include DedeInclude('templets/media_add.htm'); diff --git a/src/dede/media_edit.php b/src/dede/media_edit.php index bb36daf1..859f4e87 100755 --- a/src/dede/media_edit.php +++ b/src/dede/media_edit.php @@ -34,7 +34,7 @@ if ($dopost == 'del') { $rs = @unlink($truefile); } if ($rs == 1) { - $msg = "成功删除一个附件!"; + $msg = "成功删除一个附件"; $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE aid='".$aid."'"); } ShowMsg($msg, $backurl); @@ -64,7 +64,7 @@ if ($dopost == 'del') { $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE aid='".$myrow['aid']."'"); } } - ShowMsg('成功删除选定的文件!', $backurl); + ShowMsg('成功删除选定的文件', $backurl); exit(); } } @@ -85,27 +85,27 @@ function __save_edit() //保存更改 if ($mediatype == 1) { $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp"); if (!in_array($upfile_type, $sparr)) { - ShowMsg("您上传的不是图片类型的文件!", "javascript:history.go(-1);"); + ShowMsg("您上传的不是图片类型的文件", "javascript:history.go(-1);"); exit(); } } else if ($mediatype == 2) { $sparr = array("application/x-shockwave-flash"); if (!in_array($upfile_type, $sparr)) { - ShowMsg("您上传的不是Flash类型的文件!", "javascript:history.go(-1);"); + ShowMsg("您上传的不是Flash类型的文件", "javascript:history.go(-1);"); exit(); } } else if ($mediatype == 3) { if (!preg_match('#audio|media|video#i', $upfile_type)) { - ShowMsg("您上传的为不正确类型的影音文件!", "javascript:history.go(-1);"); + ShowMsg("您上传的为不正确类型的影音文件", "javascript:history.go(-1);"); exit(); } if (!preg_match("#\.".$cfg_mediatype."#", $upfile_name)) { - ShowMsg("您上传的影音文件扩展名无法被识别,请更改系统配置的参数!", "javascript:history.go(-1);"); + ShowMsg("您上传的影音文件扩展名无法被识别,请更改系统配置的参数", "javascript:history.go(-1);"); exit(); } } else { if (!preg_match("#\.".$cfg_softtype."#", $upfile_name)) { - ShowMsg("您上传的附件扩展名无法被识别,请更改系统配置的参数!", "javascript:history.go(-1);"); + ShowMsg("您上传的附件扩展名无法被识别,请更改系统配置的参数", "javascript:history.go(-1);"); exit(); } } @@ -151,14 +151,14 @@ function __save_edit() //保存更改 $query = " UPDATE #@__uploads SET title='$title',mediatype='$mediatype',playtime='$playtime'"; $query .= "$addquery WHERE aid='$aid' "; $dsql->ExecuteNoneQuery($query); - ShowMsg('成功更改一则附件数据!', 'media_edit.php?aid='.$aid); + ShowMsg('成功更改一则附件数据', 'media_edit.php?aid='.$aid); exit(); } //读取档案信息 $myrow = $dsql->GetOne("SELECT * FROM #@__uploads WHERE aid='".$aid."'"); if (!is_array($myrow)) { - ShowMsg('错误,找不到此编号的档案!', 'javascript:;'); + ShowMsg('错误,找不到此编号的档案', 'javascript:;'); exit(); } include DedeInclude('templets/media_edit.htm'); diff --git a/src/dede/member_do.php b/src/dede/member_do.php index 2d7dd49b..7ead066c 100755 --- a/src/dede/member_do.php +++ b/src/dede/member_do.php @@ -25,7 +25,7 @@ if ($dopost == "delmember") { $id = preg_replace("#[^0-9]#", '', $id); $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); if ($safecodeok != $safecode) { - ShowMsg("请填写正确的安全验证串!", "member_do.php?id={$id}&dopost=delmember"); + ShowMsg("请填写正确的安全验证串", "member_do.php?id={$id}&dopost=delmember"); exit(); } if (!empty($id)) { @@ -54,11 +54,11 @@ if ($dopost == "delmember") { $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE mid='$id' "); $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET mid='0' WHERE mid='$id'"); } else { - ShowMsg("无法删除此会员,如果这个会员是[管理员]
必须先删除这个[管理员]才能删除此帐号!", $ENV_GOBACK_URL, 0, 5000); + ShowMsg("无法删除此会员,如果这个会员是[管理员]
必须先删除这个[管理员]才能删除此帐号", $ENV_GOBACK_URL, 0, 5000); exit(); } } - ShowMsg("成功删除一个会员!", $ENV_GOBACK_URL); + ShowMsg("成功删除一个会员", $ENV_GOBACK_URL); exit(); } $randcode = mt_rand(10000, 99999); @@ -81,7 +81,7 @@ if ($dopost == "delmember") { if ($fmdo == 'yes') { $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); if ($safecodeok != $safecode) { - ShowMsg("请填写正确的安全验证串!", "member_do.php?id={$id}&dopost=delmembers"); + ShowMsg("请填写正确的安全验证串", "member_do.php?id={$id}&dopost=delmembers"); exit(); } if (!empty($id)) { @@ -103,11 +103,11 @@ if ($dopost == "delmember") { $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE mid IN (".str_replace("`", ",", $id).") "); $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET mid='0' WHERE mid IN (".str_replace("`", ",", $id).")"); } else { - ShowMsg("无法删除此会员,如果这个会员是管理员关连的ID,
必须先删除这个管理员才能删除此帐号!", $ENV_GOBACK_URL, 0, 3000); + ShowMsg("无法删除此会员,如果这个会员是管理员关连的ID,
必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL, 0, 3000); exit(); } } - ShowMsg("成功删除这些会员!", $ENV_GOBACK_URL); + ShowMsg("成功删除这些会员", $ENV_GOBACK_URL); exit(); } $randcode = mt_rand(10000, 99999); @@ -134,11 +134,11 @@ function __Recommend() $id = preg_replace("#[^0-9]#", "", $id); if ($matt == 0) { $dsql->ExecuteNoneQuery("UPDATE `#@__member` SET matt=1 WHERE mid='$id' AND matt<>10 LIMIT 1"); - ShowMsg("成功设置一个会员推荐!", $ENV_GOBACK_URL); + ShowMsg("成功设置一个会员推荐", $ENV_GOBACK_URL); exit(); } else { $dsql->ExecuteNoneQuery("UPDATE `#@__member` SET matt=0 WHERE mid='$id' AND matt<>10 LIMIT 1"); - ShowMsg("成功取消一个会员推荐!", $ENV_GOBACK_URL); + ShowMsg("成功取消一个会员推荐", $ENV_GOBACK_URL); exit(); } } @@ -153,7 +153,7 @@ function __EditUser() $uptime = GetMkTime($uptime); if ($matt == 10 && $oldmatt != 10) { - ShowMsg("对不起,为安全起见,不支持直接把前台会员转为管理的操作!", "-1"); + ShowMsg("对不起,为安全起见,不支持直接把前台会员转为管理的操作", "-1"); exit(); } $query = "UPDATE `#@__member` SET @@ -186,7 +186,7 @@ function __EditUser() $rs = $dsql->ExecuteNoneQuery2($query); } - ShowMsg('成功更改会员资料!', 'member_view.php?id='.$id); + ShowMsg('成功更改会员资料', 'member_view.php?id='.$id); exit(); } /*-------------- @@ -206,7 +206,7 @@ function __LoginCP() $query = "DELETE FROM `#@__member_operation` WHERE aid = '$var'"; $dsql->ExecuteNoneQuery($query); } - ShowMsg("删除成功!", "member_operations.php"); + ShowMsg("删除成功", "member_operations.php"); exit(); } } else if ($dopost == "upoperations") { @@ -216,7 +216,7 @@ function __LoginCP() foreach ($nid as $var) { $query = "UPDATE `#@__member_operation` SET sta = '1' WHERE aid = '$var'"; $dsql->ExecuteNoneQuery($query); - ShowMsg("设置成功!", "member_operations.php"); + ShowMsg("设置成功", "member_operations.php"); exit(); } } @@ -227,7 +227,7 @@ function __LoginCP() foreach ($nid as $var) { $query = "UPDATE `#@__member_operation` SET sta = '2' WHERE aid = '$var'"; $dsql->ExecuteNoneQuery($query); - ShowMsg("设置成功!", "member_operations.php"); + ShowMsg("设置成功", "member_operations.php"); exit(); } } diff --git a/src/dede/member_pmone.php b/src/dede/member_pmone.php index b534ef07..1fcde346 100755 --- a/src/dede/member_pmone.php +++ b/src/dede/member_pmone.php @@ -18,11 +18,11 @@ function CheckUserID($uid, $msgtitle = '用户名', $ckhas = true) if ($cfg_mb_notallow != '') { $nas = explode(',', $cfg_mb_notallow); if (in_array($uid, $nas)) { - return $msgtitle.'为系统禁止的标识!'; + return $msgtitle.'为系统禁止的标识'; } } if ($cfg_md_idurl == 'Y' && preg_match("#[^a-z0-9]#i", $uid)) { - return $msgtitle.'必须由英文字母或数字组成!'; + return $msgtitle.'必须由英文字母或数字组成'; } if ($cfg_soft_lang == 'utf-8') $ck_uid = utf82gb($uid); @@ -33,17 +33,17 @@ function CheckUserID($uid, $msgtitle = '用户名', $ckhas = true) if (isset($ck_uid[$i + 1]) && ord($ck_uid[$i + 1]) > 0x40) { $i++; } else { - return $msgtitle.'可能含有乱码,建议您改用英文字母和数字组合!'; + return $msgtitle.'可能含有乱码,建议您改用英文字母和数字组合'; } } else { if (preg_match("#[^0-9a-z@\.-]i#", $ck_uid[$i])) { - return $msgtitle.'不能含有 [@]、[.]、[-]以外的特殊符号!'; + return $msgtitle.'不能含有 [@]、[.]、[-]以外的特殊符号'; } } } if ($ckhas) { $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE userid LIKE '$uid' "); - if (is_array($row)) return $msgtitle."已经存在!"; + if (is_array($row)) return $msgtitle."已经存在"; } return 'ok'; } diff --git a/src/dede/member_rank.php b/src/dede/member_rank.php index 1159b108..4eea9f43 100755 --- a/src/dede/member_rank.php +++ b/src/dede/member_rank.php @@ -39,11 +39,11 @@ if ($dopost == 'save') { $dsql->ExecuteNoneQuery($inquery); } } - echo ""; + echo ""; } if ($dopost == 'del') { $dsql->ExecuteNoneQuery("DELETE FROM `#@__arcrank` WHERE id='$id' AND rank<>10"); - ShowMsg("删除成功!", "member_rank.php"); + ShowMsg("删除成功", "member_rank.php"); exit(); } diff --git a/src/dede/member_toadmin.php b/src/dede/member_toadmin.php index c84abf7c..8dd76d65 100755 --- a/src/dede/member_toadmin.php +++ b/src/dede/member_toadmin.php @@ -23,12 +23,12 @@ function __Toadmin() if ($dopost == "toadmin") { $pwd = trim($pwd); if ($pwd != '' && preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd)) { - ShowMsg('密码不合法,请使用[0-9a-zA-Z_@!.-]内的字符!', '-1', 0, 3000); + ShowMsg('密码不合法,请使用[0-9a-zA-Z_@!.-]内的字符', '-1', 0, 3000); exit(); } $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); if ($safecodeok != $safecode) { - ShowMsg("请填写正确的安全验证串!", "member_toadmin.php?id={$id}"); + ShowMsg("请填写正确的安全验证串", "member_toadmin.php?id={$id}"); exit(); } $pwdm = ''; @@ -46,7 +46,7 @@ if ($dopost == "toadmin") { } $typeids = (empty($typeids)) ? "" : $typeids; if ($typeids == '') { - ShowMsg("请为该管理员指定管理栏目!", "member_toadmin.php?id={$id}"); + ShowMsg("请为该管理员指定管理栏目", "member_toadmin.php?id={$id}"); exit(); } $typeid = join(',', $typeids); @@ -70,7 +70,7 @@ if ($dopost == "toadmin") { $inquery = "INSERT INTO `#@__member_pms` (`floginid`,`fromid`,`toid`,`tologinid`,`folder`,`subject`,`sendtime`,`writetime`,`hasview`,`isadmin`,`message`) VALUES ('$floginid','$fromid','$id','$userid','inbox','$subject','$sendtime','$writetime','0','0','$message'); "; $dsql->ExecuteNoneQuery($inquery); - ShowMsg("成功升级一个帐户!", "member_main.php"); + ShowMsg("成功升级一个帐户", "member_main.php"); exit(); } $id = preg_replace("#[^0-9]#", "", $id); diff --git a/src/dede/module_main.php b/src/dede/module_main.php index 82587dd3..6c9bc8e7 100755 --- a/src/dede/module_main.php +++ b/src/dede/module_main.php @@ -1,5 +1,4 @@ "); fclose($fp); } - /*-------------- function ShowAll(); --------------*/ @@ -61,7 +57,6 @@ if ($action == '') { $types = array('soft' => '模块', 'templets' => '模板', 'plus' => '小插件', 'patch' => '补丁'); $dm = new DedeModule($mdir); if (empty($moduletype)) $moduletype = ''; - $modules_remote = $dm->GetModuleUrlList($moduletype, $mdurl); $modules = array(); $modules = $dm->GetModuleList($moduletype); @@ -75,16 +70,15 @@ if ($action == '') { } /*-------------- function ViewDevelopoer(); ---------------*/ else if ($action == 'view_developoer') { - // 检验开发者信息 +--------------*/ +else if ($action == 'view_developoer') { + //检验开发者信息 $dm = new DedeModule($mdir); $info = $dm->GetModuleInfo($hash); - if ($info == null) { ShowMsg("获取模块信息错误,模块文件可能被篡改", -1); exit; } - $dev_id = $info['dev_id']; $devURL = DEDECDNURL."/developers/$dev_id.json"; $dhd = new DedeHttpDown(); @@ -98,25 +92,23 @@ function ViewDevelopoer(); $authAt = date("Y-m-d", $devInfo['auth_at']); if (!isset($info['dev_id'])) { - $devInfo['realname'] = $devInfo['dev_name'] = $info['team']." 未认证"; + $devInfo['realname'] = $devInfo['dev_name'] = $info['team']." 未认证"; $authAt = "0000-00-00"; } - - ShowMsg("

开发者名称:{$devInfo['dev_name']}

开发者全称:{$devInfo['realname']}

开发者ID:{$devInfo['dev_id']} 查看详情

$offUrl

认证于:{$authAt}

", "javascript:;"); + ShowMsg("

开发者名称:{$devInfo['dev_name']}

开发者全称:{$devInfo['realname']}

开发者ID:{$devInfo['dev_id']} 未认证

$offUrl

认证于:{$authAt}

", "javascript:;"); exit; } /*-------------- function Setup(); ---------------*/ else if ($action == 'setup') { +--------------*/ +else if ($action == 'setup') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); if ($infos == null) { ShowMsg("获取模块信息错误,模块文件可能被篡改", -1); exit; } - - $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); - + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); $filelists = $dm->GetFileLists($hash); $filelist = ''; $prvdirs = array(); @@ -147,85 +139,74 @@ function Setup(); $prvdirs[$prvdir][1] = TestWriteAble($prvdir); } } - $prvdir = "
\r\n"; + $prvdir = "
\r\n"; $prvdir .= "\r\n"; foreach ($prvdirs as $k => $v) { if ($v) $cw = '√'; else $cw = '×'; - $prvdir .= ""; - $prvdir .= "\r\n"; + $prvdir .= ""; + $prvdir .= "\r\n"; } $prvdir .= "
目录可写
$k$cw
$k$cw
"; - $win = new OxWindow(); $win->Init("module_main.php", "js/blank.js", "post"); $wecome_info = "模块管理"; $win->AddTitle(" 模块管理 >> 安装模块: {$infos['name']}"); $win->AddHidden("hash", $hash); $win->AddHidden("action", 'setupstart'); - - $msg = " + $msg = " - + - + - + - - + + - + - - + + - + - - + -
模块名称:模块名称: {$infos['name']}
语言:语言: {$infos['lang']} {$alertMsg}
文件大小:文件大小: {$infos['filesize']}
开发者ID:{$infos['dev_id']} 查看详情开发者ID:{$infos['dev_id']} 未认证
发布时间:发布时间: {$infos['time']}
使用协议:点击浏览...使用协议:浏览
-
- 注意事项: - 安装时请确保文件列表中涉及的目录前可写入权限,此外“后台管理目录”、“后台管理目录/templets”目录也必须暂时设置可写入权限。 -
+
注意事项:安装时请确保文件列表中涉及的目录前可写入权限,此外“后台管理目录”、“后台管理目录/templets”目录也必须暂时设置可写入权限。
目录权限检测:
../ 为根目录
./ 表示当前目录
- $prvdir - $prvdir
模块包含的所有文件列表:
+
对于已存在文件处理方法:对于已存在文件处理方法: - - - + + +
- "; +
"; $win->AddMsgItem("
$msg
"); $winform = $win->GetWindow("ok", ""); $win->Display(); @@ -234,36 +215,31 @@ function Setup(); } /*--------------- function SetupRun() ---------------*/ else if ($action == 'setupstart') { +--------------*/ +else if ($action == 'setupstart') { if (!is_writeable($mdir)) { - ShowMsg("目录 {$mdir} 不支持写入,这将导致安装程序没法正常创建!", "-1"); + ShowMsg("目录 {$mdir} 不支持写入,这将导致安装程序没法正常创建", "-1"); exit(); } $dm = new DedeModule($mdir); - $minfos = $dm->GetModuleInfo($hash); extract($minfos, EXTR_SKIP); - $menustring = addslashes($dm->GetSystemFile($hash, 'menustring')); $indexurl = str_replace('**', '=', $indexurl); - $query = "INSERT INTO `#@__sys_module`(`hashcode` , `modname` , `indexname` , `indexurl` , `ismember` , `menustring` ) - VALUES ('$hash' , '$name' , '$indexname' , '$indexurl' , '$ismember' , '$menustring' ) "; - + VALUES ('$hash' , '$name' , '$indexname' , '$indexurl' , '$ismember' , '$menustring' ) "; $rs = $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_module` WHERE hashcode LIKE '$hash' "); $rs = $dsql->ExecuteNoneQuery($query); if (!$rs) { - ShowMsg('保存数据库信息失败,无法完成安装!'.$dsql->GetError(), 'javascript:;'); + ShowMsg('保存数据库信息失败,无法完成安装'.$dsql->GetError(), 'javascript:;'); exit(); } - $dm->WriteFiles($hash, $isreplace); $filename = ''; if (!isset($autosetup) || $autosetup == 0) $filename = $dm->WriteSystemFile($hash, 'setup'); if (!isset($autodel) || $autodel == 0) $dm->WriteSystemFile($hash, 'uninstall'); $dm->WriteSystemFile($hash, 'readme'); $dm->Clear(); - //用模块的安装程序安装 if (!isset($autosetup) || $autosetup == 0) { include(DEDEDATA.'/module/'.$filename); @@ -274,35 +250,26 @@ function SetupRun() $mysql_version = $dsql->GetVersion(TRUE); //默认使用MySQL 4.1 以下版本的SQL语句,对大于4.1版本采用替换处理 TYPE=MyISAM ==> ENGINE=MyISAM DEFAULT CHARSET=#~lang~# $setupsql = $dm->GetSystemFile($hash, 'setupsql40'); - $setupsql = preg_replace("#ENGINE=MyISAM#i", 'TYPE=MyISAM', $setupsql); $sql41tmp = 'ENGINE=MyISAM DEFAULT CHARSET='.$cfg_db_language; - if ($mysql_version >= 4.1) { $setupsql = preg_replace("#TYPE=MyISAM#i", $sql41tmp, $setupsql); } - //_ROOTURL_ if ($cfg_cmspath == '/') $cfg_cmspath = ''; - $rooturl = $cfg_basehost.$cfg_cmspath; - $setupsql = preg_replace("#_ROOTURL_#i", $rooturl, $setupsql); $setupsql = preg_replace("#[\r\n]{1,}#", "\n", $setupsql); - $sqls = @split(";[ \t]{0,}\n", $setupsql); foreach ($sqls as $sql) { if (trim($sql) != '') $dsql->ExecuteNoneQuery($sql); } - ReWriteConfigAuto(); - $rflwft = ""; echo $rflwft; - UpDateCatCache(); ShowMsg('模块安装完成...', 'module_main.php'); exit(); @@ -310,51 +277,48 @@ function SetupRun() } /*-------------- function DelModule(); ---------------*/ else if ($action == 'del') { +--------------*/ +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']} 查看详情"; + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); + $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->AddHidden('hash', $hash); $win->AddHidden('action', 'delok'); - $msg = " + $msg = " - + - + - + - + - + - - + + - + -
模块名称:模块名称: {$infos['name']}
语言:语言: {$infos['lang']} {$alertMsg}
文件大小:文件大小: {$infos['filesize']}
开发者ID:开发者ID: {$dev_id}
发布时间:发布时间: {$infos['time']}
使用协议:点击浏览...使用协议:浏览
- 删除模块仅删除这个模块的安装包文件,如果您已经安装,请执行卸载程序来删除! - 删除模块仅删除这个模块的安装包文件,如果您已经安装,请执行卸载程序来删除
- "; +"; $win->AddMsgItem("
$msg
"); $winform = $win->GetWindow("ok", ""); $win->Display(); @@ -363,19 +327,18 @@ function DelModule(); } else if ($action == 'delok') { $dm = new DedeModule($mdir); $modfile = $mdir."/".$dm->GetHashFile($hash); - unlink($modfile) or die("删除文件 {$modfile} 失败!"); - ShowMsg("成功删除一个模块文件!", "module_main.php"); + unlink($modfile) or die("删除文件 {$modfile} 失败"); + ShowMsg("成功删除一个模块文件", "module_main.php"); exit(); } /*-------------- function UnInstall(); ---------------*/ else if ($action == 'uninstall') { +--------------*/ +else if ($action == 'uninstall') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); - if ($infos['url'] == '') $infos['url'] = ' '; - $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); - + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
(这个模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性)'); $filelists = $dm->GetFileLists($hash); $filelist = ''; foreach ($filelists as $v) { @@ -384,58 +347,55 @@ function 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->AddHidden("hash", $hash); $win->AddHidden("action", 'uninstallok'); - $msg = " + $msg = " - + - + - + - + - + - - + + - + - - + -
模块名称:模块名称: {$infos['name']}
语言:语言: {$infos['lang']} {$alertMsg}
文件大小:文件大小: {$infos['filesize']}
开发者ID:开发者ID: {$dev_id}
发布时间:发布时间: {$infos['time']}
使用协议:点击浏览...使用协议:浏览
模块包含的文件:
(文件路径相对于当前目录)
 模块包含的文件:
(文件路径相对于当前目录)
 
+
对于模块的文件处理方法:对于模块的文件处理方法: - - + +
- "; +"; $win->AddMsgItem("
$msg
"); $winform = $win->GetWindow("ok", ""); $win->Display(); @@ -444,13 +404,12 @@ function UnInstall(); } /*-------------- function UnInstallRun(); ---------------*/ else if ($action == 'uninstallok') { +--------------*/ +else if ($action == 'uninstallok') { $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_module` WHERE hashcode LIKE '$hash' "); $dm = new DedeModule($mdir); - $minfos = $dm->GetModuleInfo($hash); extract($minfos, EXTR_SKIP); - if (!isset($moduletype) || $moduletype != 'patch') { $dm->DeleteFiles($hash, $isreplace); } @@ -470,9 +429,7 @@ function UnInstallRun(); if (trim($sql) != '') $dsql->ExecuteNoneQuery($sql); } } - ReWriteConfigAuto(); - $rflwft = "\r\n"; + echo "\r\n"; } require_once($ImageWaterConfigFile); include DedeInclude('templets/sys_info_mark.htm'); diff --git a/src/dede/sys_passport.php b/src/dede/sys_passport.php index 0c4c4e82..1f84ab55 100755 --- a/src/dede/sys_passport.php +++ b/src/dede/sys_passport.php @@ -21,9 +21,9 @@ if ($dopost == 'save') { $configstr .= "\${$v} = '".str_replace("'", "", stripslashes(${'edit___'.$v}))."';\r\n"; } $configstr = '<'.'?'."\r\n".$configstr.'?'.'>'; - $fp = fopen($ConfigFile, "w") or die("写入文件 $ConfigFile 失败,请检查权限!"); + $fp = fopen($ConfigFile, "w") or die("写入文件 $ConfigFile 失败,请检查权限"); fwrite($fp, $configstr); fclose($fp); - echo "\r\n"; + echo "\r\n"; } include DedeInclude('templets/sys_passport.htm'); diff --git a/src/dede/sys_repair.php b/src/dede/sys_repair.php index 9b9389c7..29d9f657 100755 --- a/src/dede/sys_repair.php +++ b/src/dede/sys_repair.php @@ -12,7 +12,7 @@ require_once(dirname(__FILE__).'/config.php'); CheckPurview('sys_ArcBatch'); require_once(dirname(__FILE__).'/../include/oxwindow.class.php'); -//ShowMsg("目前暂不需要此工具,以后有需要系统会进行自动升级这个程序!
<<点击此返回>>", "javascript:;"); +//ShowMsg("目前暂不需要此工具,以后有需要系统会进行自动升级这个程序
<<点击此返回>>", "javascript:;"); //exit(); if (empty($dopost)) { $win = new OxWindow(); @@ -57,7 +57,7 @@ function 1_test_db() { }
- 已完成数据结构完整性检测! + 已完成数据结构完整性检测

如果您系统有下面几种问题之一,请检测微表正确性:
@@ -107,7 +107,7 @@ function 2_test_arctiny() { } $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` "); $msg .= "※微统计表记录数: {$row['dd']}
"; if ($row['dd'] == $allarcnum) { - $msg .= "

两者记录一致,无需修正!


"; + $msg .= "

两者记录一致,无需修正


"; } else { $sql = " TRUNCATE TABLE `#@__arctiny`"; $dsql->ExecuteNoneQuery($sql); @@ -125,9 +125,9 @@ function 2_test_arctiny() { } } $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` "); if ($row['dd'] == $allarcnum) { - $msg .= "

修正记录成功!


"; + $msg .= "

修正记录成功


"; } else { - $msg .= "

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


"; + $msg .= "

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


"; $errall = " 进行高级结合性检测>> "; } } @@ -201,7 +201,7 @@ function 3_re_arctiny() { } diff --git a/src/dede/templets/diy_edit_content.htm b/src/dede/templets/diy_edit_content.htm index 2cde79e8..973fba14 100755 --- a/src/dede/templets/diy_edit_content.htm +++ b/src/dede/templets/diy_edit_content.htm @@ -18,7 +18,7 @@ body {
- 完成所有修复操作,移除错误记录 {$errnum} 条! + 完成所有修复操作,移除错误记录 {$errnum} 条

完成修正或无错误返回>> diff --git a/src/dede/sys_safetest.php b/src/dede/sys_safetest.php index 21c09cd4..e349f8e3 100755 --- a/src/dede/sys_safetest.php +++ b/src/dede/sys_safetest.php @@ -91,7 +91,7 @@ if ($action == 'test') { AjaxHead(); TestSafe(DEDEROOT); - if ($message == '') $message = "没发现可疑文件!"; + if ($message == '') $message = "没发现可疑文件"; echo $message; exit(); } else if ($action == 'viewdiff') { @@ -132,7 +132,7 @@ else if ($action == 'clear') { @unlink($d.'/'.$filename); } } - $message = "成功清空模板缓存!"; + $message = "成功清空模板缓存"; echo $message; exit(); } diff --git a/src/dede/sys_sql_query.php b/src/dede/sys_sql_query.php index 14303083..e6505fd0 100755 --- a/src/dede/sys_sql_query.php +++ b/src/dede/sys_sql_query.php @@ -17,7 +17,7 @@ if (empty($dopost)) $dopost = ""; if ($dopost == "viewinfo") { CheckCSRF(); if (empty($tablename)) { - echo "没有指定表名!"; + echo "没有指定表名"; } else { $dsql->SetQuery("SHOW CREATE TABLE ".$dsql->dbName.".".$tablename); $dsql->Execute('me'); @@ -31,10 +31,10 @@ if ($dopost == "viewinfo") { else if ($dopost == "opimize") { CheckCSRF(); if (empty($tablename)) { - echo "没有指定表名!"; + echo "没有指定表名"; } else { $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$tablename` "); - if ($rs) echo "执行优化表: $tablename OK!"; + if ($rs) echo "执行优化表: $tablename OK"; else echo "执行优化表: $tablename 失败,原因是:".$dsql->GetError(); } exit(); @@ -58,10 +58,10 @@ else if ($dopost == "opimizeAll") { else if ($dopost == "repair") { CheckCSRF(); if (empty($tablename)) { - echo "没有指定表名!"; + echo "没有指定表名"; } else { $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `$tablename` "); - if ($rs) echo "修复表: $tablename OK!"; + if ($rs) echo "修复表: $tablename OK"; else echo "修复表: $tablename 失败,原因是:".$dsql->GetError(); } exit(); @@ -94,9 +94,9 @@ else if ($dopost == "query") { $dsql->SetQuery($sqlquery); $dsql->Execute(); if ($dsql->GetTotalRow() <= 0) { - echo "运行SQL:{$sqlquery},无返回记录!"; + echo "运行SQL:{$sqlquery},无返回记录"; } else { - echo "运行SQL:{$sqlquery},共有".$dsql->GetTotalRow()."条记录,最大返回100条!"; + echo "运行SQL:{$sqlquery},共有".$dsql->GetTotalRow()."条记录,最大返回100条"; } $j = 0; while ($row = $dsql->GetArray()) { @@ -132,12 +132,12 @@ else if ($dopost == "query") { $nerrCode .= "执行: $q 出错,错误提示:".$errCode."
"; } } - echo "成功执行{$i}个SQL语句!

"; + echo "成功执行{$i}个SQL语句

"; echo $nerrCode; } else { $dsql->ExecuteNoneQuery($sqlquery); $nerrCode = trim($dsql->GetError()); - echo "成功执行1个SQL语句!

"; + echo "成功执行1个SQL语句

"; echo $nerrCode; } exit(); diff --git a/src/dede/task_do.php b/src/dede/task_do.php index 3f909796..e79bb0bd 100755 --- a/src/dede/task_do.php +++ b/src/dede/task_do.php @@ -68,11 +68,11 @@ if ($dopost == 'makeprenext') { $arc->MakeHtml(); } if (empty($nextdo)) { - ShowMsg("完成上下篇文档更新任务!完成所有更新任务!", "close::tgtable"); + ShowMsg("完成上下篇文档更新任务完成所有更新任务", "close::tgtable"); exit(); } else { $jumpurl = GetNextUrl(); - ShowMsg("完成下篇文档更新任务! 继续执行其它任务...", $jumpurl, 0, 500); + ShowMsg("完成下篇文档更新任务 继续执行其它任务...", $jumpurl, 0, 500); exit(); } } @@ -101,11 +101,11 @@ if ($dopost == 'makeindex') { $pv->SaveToHtml($homeFile); $pv->Close(); if (empty($nextdo)) { - ShowMsg("完成主页更新任务!完成所有更新任务!", "close::tgtable"); + ShowMsg("完成主页更新任务完成所有更新任务", "close::tgtable"); exit(); } else { $jumpurl = GetNextUrl(); - ShowMsg("完成主页更新! 现在跳转到其它更新任务...", $jumpurl, 0, 500); + ShowMsg("完成主页更新 现在跳转到其它更新任务...", $jumpurl, 0, 500); exit(); } } @@ -121,7 +121,7 @@ else if ($dopost == 'makeparenttype') { $jumpurl = GetNextUrl($notallowArr); if (empty($typeid)) { - ShowMsg("完成栏目更新任务!完成所有更新任务!", "close::tgtable"); + ShowMsg("完成栏目更新任务完成所有更新任务", "close::tgtable"); exit(); } $topids = explode(',', GetTopids($typeid)); @@ -146,10 +146,10 @@ 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"); + ShowMsg("完成栏目:{$tid} 更新
完成栏目更新任务,完成所有更新任务", "close::tgtable"); exit(); } } else { diff --git a/src/dede/templets/action_search.htm b/src/dede/templets/action_search.htm index b5c039d2..3b3c91ca 100755 --- a/src/dede/templets/action_search.htm +++ b/src/dede/templets/action_search.htm @@ -1,7 +1,5 @@ - + - 操作搜索 diff --git a/src/dede/templets/ad_add.htm b/src/dede/templets/ad_add.htm index bcbdea4c..a39c21ad 100755 --- a/src/dede/templets/ad_add.htm +++ b/src/dede/templets/ad_add.htm @@ -1,7 +1,5 @@ - + - 增加广告 @@ -15,7 +13,7 @@ @@ -56,7 +54,7 @@
- 自定义表单管理 > 修改自定义表单: + 自定义表单管理 > 修改自定义表单: (修改表名不会创建新表,如果您不懂手工处理这些表,请不要更改)
+  表单管理 >> 编辑评论: diff --git a/src/dede/templets/erradd.htm b/src/dede/templets/erradd.htm index 2a1d14fe..3420b648 100755 --- a/src/dede/templets/erradd.htm +++ b/src/dede/templets/erradd.htm @@ -79,7 +79,7 @@ - diff --git a/src/dede/templets/feedback_edit.htm b/src/dede/templets/feedback_edit.htm index c07094ce..a84c316b 100755 --- a/src/dede/templets/feedback_edit.htm +++ b/src/dede/templets/feedback_edit.htm @@ -1,7 +1,5 @@ - + - 编辑评论 @@ -19,7 +17,7 @@
-  表单管理 >> 编辑评论:
diff --git a/src/dede/templets/diy_field_add.htm b/src/dede/templets/diy_field_add.htm index 01e682f2..b6e0dffe 100755 --- a/src/dede/templets/diy_field_add.htm +++ b/src/dede/templets/diy_field_add.htm @@ -31,14 +31,14 @@ function GetFields() if(itemname=="") { - ShowMsg("表单提示名称不能为空!"); + ShowMsg("表单提示名称不能为空"); theform.itemname.focus(); return false; } if(fieldname=="") { - ShowMsg("字段名称不能为空!"); + ShowMsg("字段名称不能为空"); theform.fieldname.focus(); return false; } @@ -51,7 +51,7 @@ function GetFields() if((dtype=="radio" || dtype=="select" || dtype=="checkbox") && vdefault=="") { - ShowMsg("您选择的select或radio、checkbox类型,必须默认值设置选择的项目(用逗号[,]分开)!"); + ShowMsg("您选择的select或radio、checkbox类型,必须默认值设置选择的项目(用逗号[,]分开)"); return false; } @@ -103,7 +103,7 @@ td{ padding:2px; padding-left:6px; line-height:150%; }
字段名称:
- 只能用英文字母或数字,数据表的真实字段名,如果数据类型是联动类型,该项应该填写联动类型的[组名称]。 + 只能用英文字母或数字,数据表的真实字段名,如果数据类型是联动类型,该项应该填写联动类型的[组名称]
diff --git a/src/dede/templets/diy_field_edit.htm b/src/dede/templets/diy_field_edit.htm index 6a076e7e..810e5444 100755 --- a/src/dede/templets/diy_field_edit.htm +++ b/src/dede/templets/diy_field_edit.htm @@ -25,14 +25,14 @@ function GetFields() if(itemname=="") { - ShowMsg("表单提示名称不能为空!"); + ShowMsg("表单提示名称不能为空"); theform.itemname.focus(); return false; } if((dtype=="radio"||dtype=="select"||dtype=="checkbox") && vdefault=="") { - ShowMsg("您选择的select或radio、checkbox类型,必须默认值设置选择的项目(用逗号[,]分开)!"); + ShowMsg("您选择的select或radio、checkbox类型,必须默认值设置选择的项目(用逗号[,]分开)"); return false; } diff --git a/src/dede/templets/diy_list.htm b/src/dede/templets/diy_list.htm index 5fa50458..c07e365b 100755 --- a/src/dede/templets/diy_list.htm +++ b/src/dede/templets/diy_list.htm @@ -56,10 +56,10 @@
+ +    审核  删除 - -
{dede:field.id /} {dede:field.mid function='username(@me)'/}{dede:field.title /} + {dede:field.title /} {dede:field.type function='typename(@me)'/} {dede:field.sendtime function='GetDateMk(@me)'/}
diff --git a/src/dede/templets/feedback_main.htm b/src/dede/templets/feedback_main.htm index 008b0734..734986b2 100755 --- a/src/dede/templets/feedback_main.htm +++ b/src/dede/templets/feedback_main.htm @@ -44,22 +44,22 @@ } function delFeedback() { var qstr = getCheckboxItem(); - if (qstr == "") ShowMsg("您没选中任何内容!"); + if (qstr == "") ShowMsg("您没选中任何内容"); else if (window.confirm('您确定要删除这些评论吗?')) location.href = "feedback_main.php?job=del&fid=" + qstr; } function delFeedbackIP() { var qstr = getCheckboxItem(); - if (qstr == "") ShowMsg("您没选中任何内容!"); + if (qstr == "") ShowMsg("您没选中任何内容"); else if (window.confirm('您确定要删除这些评论吗?')) location.href = "feedback_main.php?job=delall&fid=" + qstr; } function checkFeedback() { var qstr = getCheckboxItem(); - if (qstr == "") ShowMsg("您没选中任何内容!"); + if (qstr == "") ShowMsg("您没选中任何内容"); else location.href = "feedback_main.php?job=check&fid=" + qstr; } function editFeedback() { var qstr = getCheckboxItem(); - if (qstr == "") ShowMsg("您没选中任何内容!"); + if (qstr == "") ShowMsg("您没选中任何内容"); else location.href = "feedback_edit.php?job=edit&fid=" + qstr; } @@ -74,7 +74,7 @@ @@ -344,7 +342,7 @@ } function CheckSubmit() { if (document.form1.title.value == "") { - ShowMsg("自由列表标题标题不能为空!"); + ShowMsg("自由列表标题标题不能为空"); document.form1.title.focus(); return false; } diff --git a/src/dede/templets/freelist_edit.htm b/src/dede/templets/freelist_edit.htm index c0da9b81..6fd098ec 100755 --- a/src/dede/templets/freelist_edit.htm +++ b/src/dede/templets/freelist_edit.htm @@ -1,7 +1,5 @@ - + - 更改自由列表 @@ -42,7 +40,7 @@ } function CheckSubmit() { if (document.form1.title.value == "") { - ShowMsg("自由列表标题标题不能为空!"); + ShowMsg("自由列表标题标题不能为空"); document.form1.title.focus(); return false; } @@ -73,7 +71,7 @@
评论管理 >> 编辑评论: + href="">评论管理 >> 编辑评论:
@@ -107,17 +107,17 @@ 用户:{dede:field.username/}
- 文档:{dede:field.arctitle - function="RemoveXSS(@me)"/} ({dede:field.arctitle + function="RemoveXSS(@me)"/} (浏览) + target="_blank">浏览) 0) { ?>({dede:field.replycount/}条回复) IP地址:{dede:field.ip/} + href='feedback_main.php?ip={dede:field.ip/}'>{dede:field.ip/} 时间:{dede:field.dtime function="GetDateTimeMK(@me)" /} diff --git a/src/dede/templets/file_manage_main.htm b/src/dede/templets/file_manage_main.htm index daf1c289..b03e8ac6 100755 --- a/src/dede/templets/file_manage_main.htm +++ b/src/dede/templets/file_manage_main.htm @@ -1,7 +1,5 @@ - + - 文件管理器 diff --git a/src/dede/templets/freelist_add.htm b/src/dede/templets/freelist_add.htm index 6a90b8e6..64b858b6 100755 --- a/src/dede/templets/freelist_add.htm +++ b/src/dede/templets/freelist_add.htm @@ -1,7 +1,5 @@ - + - 新增自由列表 @@ -84,7 +82,7 @@ style="border:1px solid #CFCFCF;border-bottom:none;" class="table-borderless">
- 自自由列表管理 + 自自由列表管理 >> 增加一个列表:
diff --git a/src/dede/templets/freelist_main.htm b/src/dede/templets/freelist_main.htm index 12a359cd..64905d69 100755 --- a/src/dede/templets/freelist_main.htm +++ b/src/dede/templets/freelist_main.htm @@ -21,7 +21,7 @@ function ReloadPage(ordertype) { orderby = ordertype; var listArea = $Obj('rslist'); - var errMsg = "网络通信出错!
[点击此重新加载列表]"; + var errMsg = "网络通信出错
[点击此重新加载列表]"; var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在加载..."); myajax.SendGet("freelist_main.php?dopost=getlist&pageno=" + pageno + "&orderby=" + ordertype + addget); } @@ -41,12 +41,12 @@ } //删除 function DelNote(nid) { - if (!window.confirm("您确认要删除这条记录么!")) { return false; } + if (!window.confirm("您确认要删除这条记录么")) { return false; } var listArea = $Obj('rslist'); totalrow = totalrow - 1; var pagenum = Math.ceil(totalrow / pagesize); if (pagenum <= pageno) pageno = pagenum; - var errMsg = "网络通信出错!
[点击此重新加载列表]"; + var 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/dede/templets/friendlink_add.htm b/src/dede/templets/friendlink_add.htm index 1e22e227..3f3958c4 100755 --- a/src/dede/templets/friendlink_add.htm +++ b/src/dede/templets/friendlink_add.htm @@ -12,13 +12,13 @@ function CheckSubmit() if(document.form1.url.value=="http://"||document.form1.url.value=="") { document.form1.url.focus(); - ShowMsg("网址不能为空!"); + ShowMsg("网址不能为空"); return false; } if(document.form1.webname.value=="") { document.form1.webname.focus(); - ShowMsg("网站名称不能为空!"); + ShowMsg("网站名称不能为空"); return false; } return true; @@ -31,7 +31,7 @@ function CheckSubmit()
- 自自由列表管理 + 自自由列表管理 >> 更改自由列表:
- +
友情链接管理>>增加链接友情链接管理>>增加链接
diff --git a/src/dede/templets/friendlink_edit.htm b/src/dede/templets/friendlink_edit.htm index 0ba7e4e7..5328cbbf 100755 --- a/src/dede/templets/friendlink_edit.htm +++ b/src/dede/templets/friendlink_edit.htm @@ -1,7 +1,5 @@ - + - 友情链接更改 @@ -14,7 +12,7 @@ + 友情链接管理 >> 链接更改
- 友情链接管理 >> 链接更改
diff --git a/src/dede/templets/friendlink_main.htm b/src/dede/templets/friendlink_main.htm index 093c7b74..b784b950 100755 --- a/src/dede/templets/friendlink_main.htm +++ b/src/dede/templets/friendlink_main.htm @@ -1,8 +1,6 @@ {dede:config.pagesize value="20"/} - + - 友情链接管理 @@ -28,7 +26,7 @@ } } if (str == '') { - ShowMsg('您没选择任何内容!'); + ShowMsg('您没选择任何内容'); return false; } else { diff --git a/src/dede/templets/friendlink_type.htm b/src/dede/templets/friendlink_type.htm index 60cf06b6..d2b2de25 100755 --- a/src/dede/templets/friendlink_type.htm +++ b/src/dede/templets/friendlink_type.htm @@ -1,7 +1,5 @@ - + - 网站类型管理 diff --git a/src/dede/templets/imagecut.htm b/src/dede/templets/imagecut.htm index 240868da..06dd3798 100755 --- a/src/dede/templets/imagecut.htm +++ b/src/dede/templets/imagecut.htm @@ -190,7 +190,7 @@ function ReturnImg(reimg) top - 改变比例 + 改变比例 diff --git a/src/dede/templets/index2.htm b/src/dede/templets/index2.htm index 5413890e..f212f78f 100755 --- a/src/dede/templets/index2.htm +++ b/src/dede/templets/index2.htm @@ -5,7 +5,6 @@ <?php echo $cfg_webname; ?>后台管理 -