diff --git a/src/admin/album_add.php b/src/admin/album_add.php index b50a5c35..297cdefb 100644 --- a/src/admin/album_add.php +++ b/src/admin/album_add.php @@ -21,7 +21,7 @@ if ($dopost != 'save') { $cid = empty($cid) ? 0 : intval($cid); //获得栏目模型id if ($cid > 0 && $channelid == 0) { - $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid'; "); + $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid';"); $channelid = $row['channeltype']; } else { if ($channelid == 0) $channelid = 2; @@ -34,11 +34,7 @@ if ($dopost != 'save') { $maxWright = empty($maxWright)? array('cc'=>1) : $maxWright; include DedeInclude("templets/album_add.htm"); exit(); -} -/*-------------------------------- -function __save(){ } --------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; @@ -105,9 +101,6 @@ else if ($dopost == 'save') { $imgurls = "{dede:pagestyle maxwidth='$maxwidth' pagepicnum='$pagepicnum' ddmaxwidth='$ddmaxwidth' row='$row' col='$col' value='$pagestyle'/}\r\n"; $hasone = FALSE; //处理并保存从网上复制的图片 - /*--------------------- - function _getformhtml() - ------------------*/ if ($formhtml == 1) { $imagebody = stripslashes($imagebody); $imgurls .= GetCurContentAlbum($imagebody, $copysource, $litpicname); @@ -116,10 +109,7 @@ else if ($dopost == 'save') { $hasone = TRUE; } } - /*--------------------- - function _getformzip() - 处理从ZIP中解压的图片 - ---------------------*/ + //处理从ZIP中解压的图片 if ($formzip == 1) { include_once(DEDEADMIN."/file_class.php"); $zipfile = $cfg_basedir.str_replace($cfg_mainsite, '', $zipfile); diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index e4f0fc92..4edbadcf 100644 --- a/src/admin/album_edit.php +++ b/src/admin/album_edit.php @@ -48,11 +48,7 @@ if ($dopost != 'save') { $addRow = XSSClean($addRow); include DedeInclude("templets/album_edit.htm"); exit(); -} -/*-------------------------------- -function __save(){ } --------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; @@ -177,7 +173,7 @@ else if ($dopost == 'save') { $imgurls .= "{dede:img ddimg='$ddurl' text='$iinfo' width='".$imginfos[0]."' height='".$imginfos[1]."'} $iurl {/dede:img}\r\n"; } } - //从HTML中获取新图片 + //从网页中获取新图片 if ($formhtml == 1 && !empty($imagebody)) { $imagebody = stripslashes($imagebody); $imgurls .= GetCurContentAlbum($imagebody, $copysource, $litpicname); @@ -186,10 +182,7 @@ else if ($dopost == 'save') { $hasone = true; } } - /*--------------------- - function _getformzip() - 从ZIP文件中获取新图片 - ---------------------*/ + //从ZIP文件中获取新图片 if ($formzip == 1) { include_once(DEDEADMIN."/file_class.php"); $zipfile = $cfg_basedir.str_replace($cfg_mainsite, '', $zipfile); diff --git a/src/admin/archives_add.php b/src/admin/archives_add.php index f16a3c11..50f7303c 100644 --- a/src/admin/archives_add.php +++ b/src/admin/archives_add.php @@ -21,7 +21,7 @@ if ($dopost != 'save') { $cid = empty($cid) ? 0 : intval($cid); //获得栏目模型id if ($cid > 0 && $channelid == 0) { - $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid'; "); + $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid';"); $channelid = $row['channeltype']; } else { if ($channelid == 0) { @@ -37,11 +37,7 @@ if ($dopost != 'save') { $maxWright = empty($maxWright)? array('cc'=>1) : $maxWright; include DedeInclude('templets/archives_add.htm'); exit(); -} -/*-------------------------------- -function __save(){ } --------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php index 5934886b..1f55e6a1 100644 --- a/src/admin/archives_do.php +++ b/src/admin/archives_do.php @@ -19,10 +19,7 @@ if (empty($dopost)) { exit(); } $aid = isset($aid) ? preg_replace("#[^0-9]#", '', $aid) : ''; -/*-------------------------- //修改文档 -function editArchives(){ } ----------------------------*/ if ($dopost == 'editArchives') { $query = "SELECT arc.id,arc.typeid,ch.maintable,ch.editcon FROM `#@__arctiny` arc LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' "; $row = $dsql->GetOne($query); @@ -58,10 +55,7 @@ if ($dopost == 'editArchives') { } exit(); } -/*-------------------------- //浏览文档 -function viewArchives(){ } ----------------------------*/ else if ($dopost == "viewArchives") { $aid = preg_replace("#[^0-9]#", '', $aid); //获取主表信息 @@ -129,10 +123,7 @@ else if ($dopost == "viewArchives") { echo ""; exit(); } -/*-------------------------- //异步上传缩略图 -function uploadLitpic(){ } ----------------------------*/ else if ($dopost == "uploadLitpic") { $upfile = AdminUpload('litpic', 'imagelit', 0, false); if ($upfile == '-1') { @@ -171,10 +162,7 @@ else if ($dopost == "uploadLitpic") { echo $msg; exit(); } -/*-------------------------- //推荐文档 -function commendArchives(){ } ----------------------------*/ else if ($dopost == "commendArchives") { CheckPurview('a_Commend,sys_ArcBatch'); if (!empty($aid) && empty($qstr)) { @@ -205,10 +193,7 @@ else if ($dopost == "commendArchives") { ShowMsg("成功把所选文档设为推荐", $ENV_GOBACK_URL); exit(); } -/*-------------------------- //生成网页 -function makeArchives(); ----------------------------*/ else if ($dopost == "makeArchives") { CheckPurview('sys_MakeHtml,sys_ArcBatch'); if (!empty($aid) && empty($qstr)) $qstr = $aid; @@ -226,10 +211,7 @@ else if ($dopost == "makeArchives") { ShowMsg("成功更新指定$i个文件", $ENV_GOBACK_URL); exit(); } -/*-------------------------- //审核文档 -function checkArchives() { } ----------------------------*/ else if ($dopost == "checkArchives") { CheckPurview('a_Check,a_AccCheck,sys_ArcBatch'); require_once(DEDEADMIN."/inc/inc_archives_functions.php"); @@ -256,11 +238,7 @@ else if ($dopost == "checkArchives") { } ShowMsg("成功审核指定文档", $ENV_GOBACK_URL); exit(); -} -/*----------------------------- -function moveArchives(){ } -------------------------------*/ -else if ($dopost == 'moveArchives') { +} else if ($dopost == 'moveArchives') { CheckPurview('sys_ArcBatch'); if (empty($totype)) { require_once(DEDEINC.'/typelink/typelink.class.php'); @@ -273,7 +251,7 @@ else if ($dopost == 'moveArchives') { $typeOptions "; - //输出AJAX可移动窗体 + //输出Ajax可移动窗体 $divname = 'moveArchives'; echo "
移动文档
"; echo "
"; @@ -346,10 +324,7 @@ else if ($dopost == 'moveArchives') { exit(); } } -/*----------------------------- //还原文档 -function RbReturnArchives(){ } -------------------------------*/ else if ($dopost == 'return') { CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch'); require_once(DEDEINC."/libraries/oxwindow.class.php"); @@ -363,15 +338,12 @@ else if ($dopost == 'return') { $qstrs = explode('`', $qstr); foreach ($qstrs as $aid) { $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET arcrank='-1',ismake='0' WHERE id='$aid'"); - $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET `arcrank` = '-1' WHERE id = '$aid'; "); + $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET `arcrank` = '-1' WHERE id = '$aid';"); } ShowMsg("成功还原指定文档", "recycling.php"); exit(); } -/*-------------------------- //删除文档 -function delArchives(){ } ----------------------------*/ else if ($dopost == "delArchives") { CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch'); require_once(DEDEINC."/libraries/oxwindow.class.php"); @@ -409,10 +381,7 @@ else if ($dopost == "delArchives") { $win->Display(); } } -/*----------------------------- //清空文档 -function RbClearArchives(){ } -------------------------------*/ else if ($dopost == 'clear') { CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch'); require_once(DEDEINC."/libraries/oxwindow.class.php"); @@ -463,10 +432,7 @@ else if ($dopost == 'clear') { $win->Display(); } } -/*----------------------------- //清除文档 -function RbDelArchives(){ } -------------------------------*/ else if ($dopost == 'del') { CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch'); require_once(DEDEINC."/libraries/oxwindow.class.php"); @@ -504,10 +470,7 @@ else if ($dopost == 'del') { $win->Display(); } } -/*----------------------------- //快速修改 -function quickEdit(){ } -------------------------------*/ else if ($dopost == 'quickEdit') { require_once(DEDEADMIN."/inc/inc_catalog_options.php"); AjaxHead(); @@ -590,10 +553,7 @@ else if ($dopost == 'quickEdit') { {$dojobname}"; echo ""; @@ -841,14 +789,10 @@ else if ($dopost == 'attsDlg') {
选择副栏目"; $tus = new TypeUnitSelector(); diff --git a/src/admin/archives_edit.php b/src/admin/archives_edit.php index 03ca597f..9678e35e 100644 --- a/src/admin/archives_edit.php +++ b/src/admin/archives_edit.php @@ -37,11 +37,7 @@ if ($dopost != 'save') { $tags = GetTags($aid); include DedeInclude("templets/archives_edit.htm"); exit(); -} -/*-------------------------------- -function __save(){ } --------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; diff --git a/src/admin/archives_sg_add.php b/src/admin/archives_sg_add.php index 46e879cf..d96fed7b 100644 --- a/src/admin/archives_sg_add.php +++ b/src/admin/archives_sg_add.php @@ -21,7 +21,7 @@ if ($dopost != 'save') { $cid = empty($cid) ? 0 : intval($cid); //获得栏目模型id if ($cid > 0 && $channelid == 0) { - $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid'; "); + $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid';"); $channelid = $row['channeltype']; } else { if ($channelid == 0) { @@ -34,11 +34,7 @@ if ($dopost != 'save') { $channelid = $cInfos['id']; include DedeInclude("templets/archives_sg_add.htm"); exit(); -} -/*-------------------------------- -function __save(){ } --------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); if ($typeid == 0) { diff --git a/src/admin/archives_sg_edit.php b/src/admin/archives_sg_edit.php index fe82afa6..9b50baee 100644 --- a/src/admin/archives_sg_edit.php +++ b/src/admin/archives_sg_edit.php @@ -31,11 +31,7 @@ if ($dopost != 'save') { $tags = GetTags($aid); include DedeInclude('templets/archives_sg_edit.htm'); exit(); -} -/*-------------------------------- -function __save(){ } --------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); if ($typeid == 0) { diff --git a/src/admin/article_add.php b/src/admin/article_add.php index ef24a6cd..437631c2 100644 --- a/src/admin/article_add.php +++ b/src/admin/article_add.php @@ -26,7 +26,7 @@ if ($dopost != 'save') { $keywords = $writer = $source = $body = $description = $title = ''; //获得栏目模型id if ($cid > 0 && $channelid == 0) { - $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid'; "); + $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid';"); $channelid = $row['channeltype']; } else { if ($channelid == 0) { @@ -40,11 +40,7 @@ if ($dopost != 'save') { $maxWright = empty($maxWright)? array('cc'=>1) : $maxWright; include DedeInclude("templets/article_add.htm"); exit(); -} -/*-------------------------------- -function __save(){ } --------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; @@ -181,7 +177,7 @@ else if ($dopost == 'save') { $picTitle = TRUE; $titleSet = ",title='{$pictitle}'"; } - $dsql->ExecuteNoneQuery("UPDATE `#@__uploads` SET arcid='{$arcID}'{$titleSet} WHERE url LIKE '{$v}'; "); + $dsql->ExecuteNoneQuery("UPDATE `#@__uploads` SET arcid='{$arcID}'{$titleSet} WHERE url LIKE '{$v}';"); } } } diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php index b7f4a5d5..bfa07810 100644 --- a/src/admin/article_description_main.php +++ b/src/admin/article_description_main.php @@ -128,7 +128,7 @@ if ($dojob == '') { if (!preg_match("/#p#/iU", $body)) { $body = SpLongBody($body, $cfg_arcautosp_size * 1024, "#p#分页标题#e#"); $body = addslashes($body); - $dsql->ExecuteNoneQuery("UPDATE $table SET $field='$body' WHERE aid='$aid' ; "); + $dsql->ExecuteNoneQuery("UPDATE $table SET $field='$body' WHERE aid='$aid' ;"); } } }//end if limit diff --git a/src/admin/article_edit.php b/src/admin/article_edit.php index f47311bd..2fd2d72f 100644 --- a/src/admin/article_edit.php +++ b/src/admin/article_edit.php @@ -44,11 +44,7 @@ if ($dopost != 'save') { $tags = GetTags($aid); include DedeInclude("templets/article_edit.htm"); exit(); -} -/*-------------------------------- -function __save(){ } --------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; diff --git a/src/admin/article_test_same.php b/src/admin/article_test_same.php index 81158621..5ae6af4d 100644 --- a/src/admin/article_test_same.php +++ b/src/admin/article_test_same.php @@ -65,7 +65,7 @@ else if ($dopost == 'delsel') { DelArc($naid, 'OFF'); } } - $dsql->ExecuteNoneQuery(" OPTIMIZE TABLE `$maintable`; "); + $dsql->ExecuteNoneQuery(" OPTIMIZE TABLE `$maintable`;"); ShowMsg("一共删除了{$totalarc}篇重复的文档", "javascript:;"); exit(); } diff --git a/src/admin/catalog_add.php b/src/admin/catalog_add.php index fb2e13ed..d1db8466 100644 --- a/src/admin/catalog_add.php +++ b/src/admin/catalog_add.php @@ -40,11 +40,7 @@ if ($dopost == 'quick') { $typeOptions = $tl->GetOptionArray(0, 0, $channelid); include DedeInclude('templets/catalog_add_quick.htm'); exit(); -} -/*--------------------- -function action_savequick(){ } ----------------------*/ -else if ($dopost == 'savequick') { +} else if ($dopost == 'savequick') { if (!isset($savetype)) $savetype = ''; $isdefault = isset($isdefault) ? $isdefault : 0; $tempindex = "{style}/index_{$nid}.htm"; @@ -126,11 +122,7 @@ else if ($dopost == 'savequick') { UpDateCatCache(); ShowMsg('成功增加指定栏目', 'catalog_main.php'); exit(); -} -/*--------------------- -function action_save(){ } ----------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { $smalltypes = ''; if (empty($smalltype)) $smalltype = ''; if (is_array($smalltype)) $smalltypes = join(',', $smalltype); diff --git a/src/admin/catalog_do.php b/src/admin/catalog_do.php index 7a0a76c0..7d765d42 100644 --- a/src/admin/catalog_do.php +++ b/src/admin/catalog_do.php @@ -16,10 +16,7 @@ if (empty($dopost)) { $cid = empty($cid) ? 0 : intval($cid); $unittype = empty($unittype) ? 0 : intval($unittype); $channelid = empty($channelid) ? 0 : intval($channelid); -/*-------------------------- //增加文档 -function addArchives(); ----------------------------*/ if ($dopost == "addArchives") { //默认文档调用发布表单 if (empty($cid) && empty($channelid)) { @@ -43,10 +40,7 @@ if ($dopost == "addArchives") { header("location:{$gurl}?channelid={$channelid}&cid={$cid}"); exit(); } -/*-------------------------- //管理文档 -function listArchives(); ----------------------------*/ else if ($dopost == "listArchives") { if (!empty($gurl)) { if (empty($arcrank)) { @@ -78,18 +72,12 @@ else if ($dopost == "listArchives") { header("location:{$gurl}?channelid={$channelid}&cid={$cid}"); exit(); } -/*-------------------------- //浏览通用模板目录 -function viewTempletDir(); ----------------------------*/ else if ($dopost == "viewTemplet") { header("location:tpl.php?path=/".$cfg_df_style); exit(); } -/*------------------------ -浏览单个页面的栏目 -function ViewSgPage() -------------------------*/ +//浏览单个页面的栏目 else if ($dopost == "viewSgPage") { require_once(DEDEINC."/archive/listview.class.php"); $lv = new ListView($cid); @@ -97,10 +85,7 @@ else if ($dopost == "viewSgPage") { ShowMsg("更新缓冲,请稍后", $pageurl); exit(); } -/*------------------------ -修改栏目排列顺序 -function upRank() -------------------------*/ +//修改栏目排列顺序 else if ($dopost == "upRank") { //检查权限许可 CheckPurview('t_Edit,t_AccEdit'); @@ -133,10 +118,7 @@ else if ($dopost == "upRank") { ShowMsg("操作成功,正在返回", "catalog_main.php"); exit(); } -/*-------------------------- //更新栏目缓存 -function UpCatlogCache(); ----------------------------*/ else if ($dopost == "upcatcache") { UpDateCatCache(); $sql = " TRUNCATE TABLE `#@__arctiny`"; @@ -161,18 +143,12 @@ else if ($dopost == "upcatcache") { ShowMsg("操作成功,正在返回", "catalog_main.php"); exit(); } -/*--------------------- -获取js文件 -function GetJs -----------------------*/ +//获取js文件 else if ($dopost == "GetJs") { header("location:makehtml_js.php"); exit(); } -/*----------- -获得子类的文档 -function GetSunListsMenu(); ------------*/ +//获得子类的文档 else if ($dopost == "GetSunListsMenu") { $userChannel = $cuserLogin->getUserChannel(); require_once(DEDEINC."/typelink/typeunit.class.menu.php"); @@ -180,12 +156,7 @@ else if ($dopost == "GetSunListsMenu") { PutCookie('lastCidMenu', $cid, 3600 * 24, "/"); $tu = new TypeUnit($userChannel); $tu->LogicListAllSunType($cid, " "); -} -/*----------- -获得子类的文档 -function GetSunLists(); ------------*/ -else if ($dopost == "GetSunLists") { +} else if ($dopost == "GetSunLists") { require_once(DEDEINC."/typelink/typeunit.class.admin.php"); AjaxHead(); PutCookie('lastCid', $cid, 3600 * 24, "/"); @@ -196,10 +167,7 @@ else if ($dopost == "GetSunLists") { echo "\r\n"; $tu->Close(); } -/*---------------- -合并栏目 -function unitCatalog() { } ------------------*/ +//合并栏目 else if ($dopost == 'unitCatalog') { CheckPurview('t_Move'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); @@ -255,10 +223,7 @@ else if ($dopost == 'unitCatalog') { exit(); } } -/*---------------- -移动栏目 -function moveCatalog() { } ------------------*/ +//移动栏目 else if ($dopost == 'moveCatalog') { CheckPurview('t_Move'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); diff --git a/src/admin/catalog_edit.php b/src/admin/catalog_edit.php index 91afc0c9..50d31b27 100644 --- a/src/admin/catalog_edit.php +++ b/src/admin/catalog_edit.php @@ -16,9 +16,6 @@ $id = isset($id) ? intval($id) : 0; CheckPurview('t_Edit,t_AccEdit'); //检查栏目操作许可 CheckCatalog($id, '您无权修改本栏目'); -/*----------------------- -function action_save() -----------------------*/ if ($dopost == "save") { $description = Html2Text($description, 1); $keywords = Html2Text($keywords, 1); @@ -36,7 +33,7 @@ if ($dopost == "save") { } //如果选择子栏目可投稿,更新顶级栏目为可投稿 if ($topid > 0 && $issend == 1) { - $dsql->ExecuteNoneQuery("UPDATE `#@__arctype` SET issend='$issend' WHERE id='$topid'; "); + $dsql->ExecuteNoneQuery("UPDATE `#@__arctype` SET issend='$issend' WHERE id='$topid';"); } $slinks = " id IN (".GetSonIds($id).")"; //修改顶级栏目时强制修改下级的多站点支持属性 @@ -70,7 +67,7 @@ else if ($dopost == "savetime") { } //如果选择子栏目可投稿,更新顶级栏目为可投稿 if ($topid > 0 && $issend == 1) { - $dsql->ExecuteNoneQuery("UPDATE `#@__arctype` SET issend='$issend' WHERE id='$topid'; "); + $dsql->ExecuteNoneQuery("UPDATE `#@__arctype` SET issend='$issend' WHERE id='$topid';"); } $upquery = "UPDATE `#@__arctype` SET issend='$issend',sortrank='$sortrank',typedir='$typedir',typename='$typename',isdefault='$isdefault',defaultname='$defaultname',ispart='$ispart',corank='$corank' $uptopsql WHERE id='$id' "; if (!$dsql->ExecuteNoneQuery($upquery)) { diff --git a/src/admin/config.php b/src/admin/config.php index 13725814..214c5002 100644 --- a/src/admin/config.php +++ b/src/admin/config.php @@ -41,7 +41,7 @@ $isUrlOpen = @ini_get('allow_url_fopen'); $dedeNowurl = GetCurUrl(); $dedeNowurls = explode('?', $dedeNowurl); $s_scriptName = $dedeNowurls[0]; -//检验用户登录状态 +//检验会员登录状态 $cuserLogin = new userLogin(); if ($cuserLogin->getUserID() == -1) { if (preg_match("#PHP (.*) Development Server#", $_SERVER['SERVER_SOFTWARE'])) { @@ -139,10 +139,10 @@ function DedeInclude($filename, $isabs = FALSE) return $isabs ? $filename : DEDEADMIN.'/'.$filename; } /** - * 根据用户mid获取用户名称 + * 根据会员mid获取会员名称 * * @access public - * @param int $mid 用户id + * @param int $mid 会员id * @return string */ if (!function_exists('GetMemberName')) { diff --git a/src/admin/content_batchup_action.php b/src/admin/content_batchup_action.php index 100ab24f..2895b408 100644 --- a/src/admin/content_batchup_action.php +++ b/src/admin/content_batchup_action.php @@ -118,8 +118,8 @@ else if ($action == 'move') { ShowMsg('该操作必须指定栏目', 'javascript:;'); exit(); } - $typeold = $dsql->GetOne("SELECT * FROM `#@__arctype` WHERE id='$typeid'; "); - $typenew = $dsql->GetOne("SELECT * FROM `#@__arctype` WHERE id='$newtypeid'; "); + $typeold = $dsql->GetOne("SELECT * FROM `#@__arctype` WHERE id='$typeid';"); + $typenew = $dsql->GetOne("SELECT * FROM `#@__arctype` WHERE id='$newtypeid';"); if (!is_array($typenew)) { ShowMsg("无法检测移动到的新栏目的信息,不能完成操作", "javascript:;"); exit(); diff --git a/src/admin/dialog/config.php b/src/admin/dialog/config.php index 05343756..90ebd62c 100644 --- a/src/admin/dialog/config.php +++ b/src/admin/dialog/config.php @@ -1,6 +1,6 @@ getUserID() <= 0) { if (empty($adminDirHand)) { diff --git a/src/admin/diy_edit.php b/src/admin/diy_edit.php index b496ae2f..722d6050 100644 --- a/src/admin/diy_edit.php +++ b/src/admin/diy_edit.php @@ -14,9 +14,6 @@ require_once(DEDEINC."/dedetag.class.php"); require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($dopost)) $dopost = ""; $diyid = (empty($diyid) ? 0 : intval($diyid)); -/*---------------- -function __SaveEdit() ------------------*/ if ($dopost == "save") { $public = isset($public) && is_numeric($public) ? $public : 0; $name = dede_htmlspecialchars($name); @@ -24,11 +21,7 @@ if ($dopost == "save") { $dsql->ExecuteNoneQuery($query); ShowMsg("成功修改一个自定义表单", "diy_main.php"); exit(); -} -/*---------------- -function __Delete() ------------------*/ -else if ($dopost == "delete") { +} else if ($dopost == "delete") { @set_time_limit(0); CheckPurview('c_Del'); $row = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid='$diyid'"); @@ -62,9 +55,6 @@ else if ($dopost == "delete") { exit(); } } -/*---------------- -function edit() ------------------*/ $row = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid='$diyid'"); include DEDEADMIN."/templets/diy_edit.htm"; ?> \ No newline at end of file diff --git a/src/admin/diy_field_add.php b/src/admin/diy_field_add.php index 543be6dc..704d05c4 100644 --- a/src/admin/diy_field_add.php +++ b/src/admin/diy_field_add.php @@ -15,9 +15,6 @@ if (empty($action)) $action = ''; $mysql_version = $dsql->GetVersion(); $mysql_versions = explode(".", trim($mysql_version)); $mysql_version = $mysql_versions[0].".".$mysql_versions[1]; -/*---------------------- -function Save() ----------------------*/ if ($action == 'save') { //模型信息 $fieldname = strtolower($fieldname); @@ -70,9 +67,6 @@ if ($action == 'save') { exit(); } //检测模型相关信息,并初始化相关数据 -/*---------------------- -function ShowPage() ----------------------*/ $row = $dsql->GetOne("SELECT `table` FROM `#@__diyforms` WHERE diyid='$diyid'"); $trueTable = $row['table']; $tabsql = "CREATE TABLE IF NOT EXISTS `$trueTable`( diff --git a/src/admin/diy_field_edit.php b/src/admin/diy_field_edit.php index 4bc7d0d7..2d16726b 100644 --- a/src/admin/diy_field_edit.php +++ b/src/admin/diy_field_edit.php @@ -33,9 +33,6 @@ foreach ($ds as $d) { $fieldtypes[$dds[0]] = $dds[1]; } //保存修改 -/*-------------------- -function _SAVE() -----------------------*/ if ($action == 'save') { if (!isset($fieldtypes[$dtype])) { ShowMsg("您修改的是系统专用类型的数据,禁止操作", "-1"); @@ -91,10 +88,7 @@ if ($action == 'save') { ShowMsg("成功修改一个字段的配置", "diy_edit.php?diyid={$diyid}"); exit(); } -/*------------------ -删除字段 -function _DELETE() --------------------*/ +//删除字段 else if ($action == "delete") { //检测旧数据类型,并替换为新配置 foreach ($dtp->CTags as $tagid => $ctag) { diff --git a/src/admin/file_manage_control.php b/src/admin/file_manage_control.php index f0bf35be..cb5b3432 100644 --- a/src/admin/file_manage_control.php +++ b/src/admin/file_manage_control.php @@ -20,38 +20,23 @@ else $inpath = $cfg_basedir.$activepath; //文件管理器交互与逻辑控制文件 $fmm = new FileManagement(); $fmm->Init(); -/*--------------- -function __rename(); -----------------*/ if ($fmdo == "rename") { $fmm->RenameFile($oldfilename, $newfilename); } //新建目录 -/*--------------- -function __newdir(); -----------------*/ else if ($fmdo == "newdir") { CheckCSRF(); $fmm->NewDir($newpath); } //移动文件 -/*--------------- -function __move(); -----------------*/ else if ($fmdo == "move") { $fmm->MoveFile($filename, $newpath); } //删除文件 -/*--------------- -function __delfile(); -----------------*/ else if ($fmdo == "del") { $fmm->DeleteFile($filename); } //文件修改 -/*--------------- -function __saveEdit(); -----------------*/ else if ($fmdo == "edit") { CheckCSRF(); $filename = str_replace("..", "", $filename); @@ -92,9 +77,6 @@ else if ($fmdo=="editview") } */ //文件上传 -/*--------------- -function __upload(); -----------------*/ else if ($fmdo == "upload") { $j = 0; for ($i = 1; $i <= 50; $i++) { diff --git a/src/admin/freelist_main.php b/src/admin/freelist_main.php index 973cfefa..e9dfaafc 100644 --- a/src/admin/freelist_main.php +++ b/src/admin/freelist_main.php @@ -34,7 +34,7 @@ if ($dopost=='getlist') { //删除字段 else if ($dopost=='del') { $aid = preg_replace("#[^0-9]#", "", $aid); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__freelist` WHERE aid='$aid'; "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__freelist` WHERE aid='$aid';"); AjaxHead(); GetTagList($dsql,$pageno,$pagesize,$orderby); exit(); diff --git a/src/admin/friendlink_add.php b/src/admin/friendlink_add.php index ccef61e6..44eaf5b2 100644 --- a/src/admin/friendlink_add.php +++ b/src/admin/friendlink_add.php @@ -40,10 +40,10 @@ if ($dopost == "add") { } else { $imgurl = $logo; } - //强制检测用户友情链接分类是否数据结构不符 + //强制检测会员友情链接分类是否数据结构不符 if (empty($typeid) || preg_match("#[^0-9]#", $typeid)) { $typeid = 0; - $dsql->ExecuteNoneQuery("ALTER TABLE `#@__flinktype` CHANGE `ID` `id` MEDIUMINT( 8 ) UNSIGNED DEFAULT NULL AUTO_INCREMENT; "); + $dsql->ExecuteNoneQuery("ALTER TABLE `#@__flinktype` CHANGE `ID` `id` MEDIUMINT( 8 ) UNSIGNED DEFAULT NULL AUTO_INCREMENT;"); } $sortrank = isset($sortrank)? intval($sortrank) : 1; $url = isset($url)? HtmlReplace($url, -1) : ''; diff --git a/src/admin/inc/grouplist.txt b/src/admin/inc/grouplist.txt index 5227b441..6da20ce5 100644 --- a/src/admin/inc/grouplist.txt +++ b/src/admin/inc/grouplist.txt @@ -60,7 +60,7 @@ >>系统管理权限 ->sys_User>系统用户管理 +>sys_User>系统会员管理 >sys_Group>系统组管理 >sys_MdPwd>修改个人密码 >sys_DelUpload>删除附件 diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php index f81a2109..0d04ee36 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -328,13 +328,13 @@ $actionSearch[9] = array( 'linkurl' => 'sys_info.php' ), 1 => array( - 'title' => '系统用户管理', + 'title' => '系统会员管理', 'description' => '网站管理员管理', 'purview' => 'sys_User', 'linkurl' => 'sys_admin_user.php' ), 2 => array( - 'title' => '用户组设置', + 'title' => '会员组设置', 'description' => '网站管理员组别的划分', 'purview' => 'sys_Group', 'linkurl' => 'sys_group.php' diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php index f79b7504..fbe88802 100644 --- a/src/admin/inc/inc_archives_functions.php +++ b/src/admin/inc/inc_archives_functions.php @@ -174,7 +174,7 @@ function GetCurContent($body) * * @access public * @param string $url 地址 - * @param int $uid 用户id + * @param int $uid 会员id * @return array */ function GetRemoteImage($url, $uid = 0) @@ -351,7 +351,7 @@ function GetDDImage($litpic, $picname, $isremote) $ntime = time(); if (($litpic != 'none' || $litpic != 'ddfirst') && !empty($_FILES[$litpic]['tmp_name']) && is_uploaded_file($_FILES[$litpic]['tmp_name']) ) { - //如果用户自行上传缩略图 + //如果会员自行上传缩略图 $istype = 0; $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png"); $_FILES[$litpic]['type'] = strtolower(trim($_FILES[$litpic]['type'])); @@ -665,7 +665,7 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '') $filename = ''; $isrm_up = FALSE; $handurl = trim($handurl); - //如果用户自行上传了图片 + //如果会员自行上传了图片 if (!empty($_FILES[$upname]['tmp_name']) && is_uploaded_file($_FILES[$upname]['tmp_name'])) { $istype = 0; $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png"); diff --git a/src/admin/inc/inc_batchup.php b/src/admin/inc/inc_batchup.php index 4925ff4f..27059c7c 100644 --- a/src/admin/inc/inc_batchup.php +++ b/src/admin/inc/inc_batchup.php @@ -60,7 +60,7 @@ function DelArc($aid, $type = 'ON', $onlyfile = FALSE, $recycle = 0) /** 删除到回收站 **/ if ($cfg_delete == 'Y' && $type == 'ON') { $dsql->ExecuteNoneQuery("UPDATE `$maintable` SET arcrank='-2' WHERE id='$aid' "); - $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET `arcrank` = '-2' WHERE id = '$aid'; "); + $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET `arcrank` = '-2' WHERE id = '$aid';"); } else { //删除数据库记录 if (!$onlyfile) { diff --git a/src/admin/inc/inc_catalog_options.php b/src/admin/inc/inc_catalog_options.php index 1ccec1e2..173d2eb0 100644 --- a/src/admin/inc/inc_catalog_options.php +++ b/src/admin/inc/inc_catalog_options.php @@ -13,7 +13,7 @@ * * @access public * @param string $selid 选择id - * @param string $userCatalog 用户栏目 + * @param string $userCatalog 会员栏目 * @param string $channeltype 栏目类型 * @return string */ @@ -31,7 +31,7 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) if ($row['ispart'] == 1) $OptionArrayList .= ""; else $OptionArrayList .= ""; } - //是否限定用户管理的栏目 + //是否限定会员管理的栏目 if ($cfg_admin_channel == 'array') { if (count($admin_catalogs) == 0) { $query = "SELECT id,typename,ispart,channeltype FROM `#@__arctype` WHERE 1=2 "; diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index 9e920a4b..aa1ad8a3 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -60,8 +60,8 @@ if ($cuserLogin->getUserType() >= 10) { - - + + diff --git a/src/admin/index_testenv.php b/src/admin/index_testenv.php index 6e0f079a..e7443edf 100644 --- a/src/admin/index_testenv.php +++ b/src/admin/index_testenv.php @@ -78,7 +78,7 @@ if (!function_exists('PostHost')) { } } if (!function_exists('TestAdminPWD')) { - //返回结果,1没有修改默认管理员名称,2没有修改默认管理员用户名和密码,3没有发现默认账号 + //返回结果,1没有修改默认管理员名称,2没有修改默认管理员会员名和密码,3没有发现默认账号 function TestAdminPWD() { global $dsql; diff --git a/src/admin/makehtml_all.php b/src/admin/makehtml_all.php index 2e6c4aee..acb0b9e1 100644 --- a/src/admin/makehtml_all.php +++ b/src/admin/makehtml_all.php @@ -131,6 +131,6 @@ function OptimizeData($dsql) } $tptable = ''; foreach ($tptables as $t) $tptable .= ($tptable == '' ? "`{$t}`" : ",`{$t}`"); - $dsql->ExecuteNoneQuery(" OPTIMIZE TABLE $tptable; "); + $dsql->ExecuteNoneQuery(" OPTIMIZE TABLE $tptable;"); } ?> \ No newline at end of file diff --git a/src/admin/media_edit.php b/src/admin/media_edit.php index 5c31b5a5..9c0d0e41 100644 --- a/src/admin/media_edit.php +++ b/src/admin/media_edit.php @@ -13,9 +13,7 @@ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_Upload,sys_MyUpload'); if (empty($dopost)) $dopost = ""; $backurl = isset($_COOKIE['ENV_GOBACK_URL']) ? $_COOKIE['ENV_GOBACK_URL'] : "javascript:history.go(-1);"; -/*--------------------------- -function __del_file() //删除附件 ------------------------------*/ +//删除附件 if ($dopost == 'del') { CheckPurview('sys_DelUpload'); if (empty($ids)) { @@ -64,9 +62,7 @@ if ($dopost == 'del') { exit(); } } -/*-------------------------------- -function __save_edit() //保存修改 ------------------------------------*/ +//保存修改 else if ($dopost == 'save') { if ($aid == "") exit(); CheckCSRF(); diff --git a/src/admin/member_do.php b/src/admin/member_do.php index ac060932..82f46653 100644 --- a/src/admin/member_do.php +++ b/src/admin/member_do.php @@ -24,7 +24,7 @@ if ($dopost == "delmember") { exit(); } if (!empty($id)) { - //删除用户信息 + //删除会员信息 $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE mid='$id' LIMIT 1 "); $rs = 0; if ($row['matt'] == 10) { @@ -39,7 +39,7 @@ if ($dopost == "delmember") { $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_space` WHERE mid='$id' LIMIT 1"); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_company` WHERE mid='$id' LIMIT 1"); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_person` WHERE mid='$id' LIMIT 1"); - //删除用户相关数据 + //删除会员相关数据 $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_stow` WHERE mid='$id' "); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_flink` WHERE mid='$id' "); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_operation` WHERE mid='$id' "); @@ -79,14 +79,14 @@ if ($dopost == "delmember") { exit(); } if (!empty($id)) { - //删除用户信息 + //删除会员信息 $rs = $dsql->ExecuteNoneQuery2("DELETE FROM `#@__member` WHERE mid IN (".str_replace("`", ",", $id).") And matt<>10 "); if ($rs > 0) { $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_tj` WHERE mid IN (".str_replace("`", ",", $id).") "); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_space` WHERE mid IN (".str_replace("`", ",", $id).") "); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_company` WHERE mid IN (".str_replace("`", ",", $id).") "); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_person` WHERE mid IN (".str_replace("`", ",", $id).") "); - //删除用户相关数据 + //删除会员相关数据 $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_stow` WHERE mid IN (".str_replace("`", ",", $id).") "); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_flink` WHERE mid IN (".str_replace("`", ",", $id).") "); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_operation` WHERE mid IN (".str_replace("`", ",", $id).") "); diff --git a/src/admin/member_main.php b/src/admin/member_main.php index 7333d459..21e1c44b 100644 --- a/src/admin/member_main.php +++ b/src/admin/member_main.php @@ -21,7 +21,7 @@ else $keyword = trim(FilterSearch($keyword)); $mtypeform = empty($mtype) ? "\r\n" : "\r\n"; $sexform = empty($sex) ? "\r\n" : "\r\n"; $sortkey = empty($sortkey) ? 'mid' : preg_replace("#[^a-z]#i", '', $sortkey); -$staArr = array(-2 => '限制禁言用户', -1 => '未通过审核', 0 => '审核通过需要填写信息', 1 => '待补充完善信息', 2 => '正常使用'); +$staArr = array(-2 => '限制禁言会员', -1 => '未通过审核', 0 => '审核通过需要填写信息', 1 => '待补充完善信息', 2 => '正常使用'); $staArrmatt = array(1 => '被推荐', 0 => '非普通 '); $MemberTypes = array(); $dsql->SetQuery("SELECT `rank`,membername From `#@__arcrank` where `rank`>0 "); diff --git a/src/admin/member_pmone.php b/src/admin/member_pmone.php index c0752f30..9201316b 100644 --- a/src/admin/member_pmone.php +++ b/src/admin/member_pmone.php @@ -10,8 +10,8 @@ */ require_once(dirname(__FILE__)."/config.php"); CheckPurview('member_Pm'); -//检查用户名的合法性 -function CheckUserID($uid, $msgtitle = '用户名', $ckhas = true) +//检查会员名的合法性 +function CheckUserID($uid, $msgtitle = '会员名', $ckhas = true) { global $cfg_mb_notallow, $cfg_mb_idmin, $cfg_md_idurl, $cfg_soft_lang, $dsql; if ($cfg_mb_notallow != '') { @@ -52,14 +52,14 @@ if ($action == "post") { ShowMsg("请填写信息标题", "-1"); exit(); } - $msg = CheckUserID($msgtoid, "用户名", false); + $msg = CheckUserID($msgtoid, "会员名", false); if ($msg != 'ok') { ShowMsg($msg, "-1"); exit(); } $row = $dsql->GetOne("SELECT * FROM `#@__member` where userid like '$msgtoid' "); if (!is_array($row)) { - ShowMsg("您指定的用户不存在,不能发送信息", "-1"); + ShowMsg("您指定的会员不存在,不能发送信息", "-1"); exit(); } $subject = cn_substrR(HtmlReplace($subject, 1), 60); diff --git a/src/admin/member_toadmin.php b/src/admin/member_toadmin.php index 5d8c0aec..3dbfe64e 100644 --- a/src/admin/member_toadmin.php +++ b/src/admin/member_toadmin.php @@ -14,10 +14,7 @@ if (empty($dopost)) $dopost = ''; if (empty($fmdo)) $fmdo = ''; $ENV_GOBACK_URL = isset($_COOKIE['ENV_GOBACK_URL']) ? 'member_main.php' : ''; $row = array(); -/*---------------- -function __Toadmin() -升级为管理员 -----------------*/ +//升级为管理员 if ($dopost == "toadmin") { $pwd = trim($pwd); if ($pwd != '' && preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd)) { @@ -82,8 +79,7 @@ if ($dopost == "toadmin") { exit(); } $id = preg_replace("#[^0-9]#", "", $id); - -//显示用户信息 +//显示会员信息 $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); $typeOptions = ''; diff --git a/src/admin/member_view.php b/src/admin/member_view.php index 54eed48e..03ce3eda 100644 --- a/src/admin/member_view.php +++ b/src/admin/member_view.php @@ -15,13 +15,13 @@ $id = preg_replace("#[^0-9]#", "", $id); $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE mid='$id'"); $staArr = array( -10 => '等待验证邮件', - -2 => '限制禁言用户', + -2 => '限制禁言会员', -1 => '未通过审核', 0 => '审核通过需要填写信息', 1 => '待补充完善信息', 2 => '正常使用' ); -//如果这个用户是管理员帐号,必须有足够权限的用户才能操作 +//如果这个会员是管理员帐号,必须有足够权限的会员才能操作 if ($row['matt'] == 10) CheckPurview('sys_User'); if ($row['uptime'] > 0 && $row['exptime'] > 0) { $mhasDay = $row['exptime'] - ceil((time() - $row['uptime']) / 3600 / 24) + 1; diff --git a/src/admin/module_main.php b/src/admin/module_main.php index 132e05a4..093aabf3 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -52,9 +52,6 @@ function ReWriteConfigAuto() fwrite($fp, "?".">"); fclose($fp); } -/*-------------- -function ShowAll(); ---------------*/ if ($action == '') { $types = array('soft' => '模块', 'templets' => '模板', 'plus' => '小插件', 'patch' => '补丁'); $dm = new DedeModule($mdir); @@ -69,11 +66,7 @@ if ($action == '') { require_once(dirname(__FILE__)."/templets/module_main.htm"); $dm->Clear(); exit(); -} -/*-------------- -function ViewDevelopoer(); ---------------*/ -else if ($action == 'view_developoer') { +} else if ($action == 'view_developoer') { //检验开发者信息 $dm = new DedeModule($mdir); $info = $dm->GetModuleInfo($hash); @@ -98,11 +91,7 @@ else if ($action == 'view_developoer') { } ShowMsg("

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

开发者id:{$devInfo['dev_id']}

认证于:{$authAt}", "-1"); exit; -} -/*-------------- -function Setup(); ---------------*/ -else if ($action == 'setup') { +} else if ($action == 'setup') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); if ($infos == null) { @@ -219,11 +208,7 @@ else if ($action == 'setup') { $win->Display(); $dm->Clear(); exit(); -} -/*--------------- -function SetupRun() ---------------*/ -else if ($action == 'setupstart') { +} else if ($action == 'setupstart') { if (!is_writeable($mdir)) { ShowMsg("目录{$mdir}不支持写入,这导致程序安装没法正常创建", "-1"); exit(); @@ -280,11 +265,7 @@ else if ($action == 'setupstart') { ShowMsg('模块安装完成', 'module_main.php'); exit(); } -} -/*-------------- -function DelModule(); ---------------*/ -else if ($action == 'del') { +} else if ($action == 'del') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
该模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性'); @@ -335,11 +316,7 @@ else if ($action == 'del') { 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'] = ' '; @@ -404,11 +381,7 @@ else if ($action == 'uninstall') { $win->Display(); $dm->Clear(); exit(); -} -/*-------------- -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 = (array)$dm->GetModuleInfo($hash); @@ -441,11 +414,7 @@ else if ($action == 'uninstallok') { ShowMsg('模块卸载完成', 'module_main.php'); exit(); } -} -/*-------------- -function ShowReadme(); ---------------*/ -else if ($action == 'showreadme') { +} else if ($action == 'showreadme') { $dm = new DedeModule($mdir); $msg = $dm->GetSystemFile($hash, 'readme'); $msg = preg_replace("/(.*)GetWindow("hand"); $win->Display(); exit(); -} -/*-------------- -function ViewOne(); ---------------*/ -else if ($action == 'view') { +} else if ($action == 'view') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); if ($infos['url'] == '') $infos['url'] = ' '; @@ -535,11 +500,7 @@ else if ($action == 'view') { $win->Display(); $dm->Clear(); exit(); -} -/*-------------- -function Edit(); ---------------*/ -else if ($action == 'edit') { +} else if ($action == 'edit') { $dm = new DedeModule($mdir); $minfos = (array)$dm->GetModuleInfo($hash); extract($minfos, EXTR_SKIP); @@ -554,11 +515,7 @@ else if ($action == 'edit') { $dm->Clear(); require_once(dirname(__FILE__).'/templets/module_edit.htm'); exit(); -} -/*-------------- -function Download(); ---------------*/ -else if ($action == 'download') { +} else if ($action == 'download') { ShowMsg("暂不支持模块下载功能", "javascript:;"); } ?> \ No newline at end of file diff --git a/src/admin/module_make.php b/src/admin/module_make.php index 2f239c08..0d6f52a2 100644 --- a/src/admin/module_make.php +++ b/src/admin/module_make.php @@ -21,10 +21,7 @@ if ($action == '') { require_once(dirname(__FILE__)."/templets/module_make.htm"); exit(); } -/*------------- //生成项目 -function Makemodule() ---------------*/ else if ($action == 'make') { require_once(DEDEINC.'/libraries/dedehttpdown.class.php'); //校验私钥,确定开发者身份 @@ -168,10 +165,7 @@ $filelist ShowMsg("成功对一个新模块进行编译", "module_main.php"); exit(); } -/*------------- //修改项目 -function editModule() ---------------*/ else if ($action == 'edit') { $filelist = str_replace("\r", "\n", trim($filelist)); $filelist = trim(preg_replace("#[\n]{1,}#", "\n", $filelist)); diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php index affc5dde..faec37a1 100644 --- a/src/admin/mychannel_edit.php +++ b/src/admin/mychannel_edit.php @@ -14,9 +14,6 @@ require_once(DEDEINC."/dedetag.class.php"); require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($dopost)) $dopost = ""; $id = isset($id) && is_numeric($id) ? $id : 0; -/*---------------- -function __ShowHide() ------------------*/ if ($dopost == "show") { $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET isshow=1 WHERE id='$id' "); ShowMsg("操作成功", "mychannel_main.php"); @@ -25,11 +22,7 @@ if ($dopost == "show") { $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET isshow=0 WHERE id='$id'"); ShowMsg("操作成功", "mychannel_main.php"); exit(); -} -/*---------------- -function __CopyStart() ------------------*/ -else if ($dopost == "copystart") { +} else if ($dopost == "copystart") { if ($id == -1) { ShowMsg("专题文档模型不支持复制", "-1"); exit(); @@ -88,11 +81,7 @@ else if ($dopost == "copystart") { $winform = $win->GetWindow("ok", ""); $win->Display(); exit(); -} -/*---------------- -function __Export() ------------------*/ -else if ($dopost == "export") { +} else if ($dopost == "export") { if ($id == -1) { ShowMsg("专题文档模型不支持导出", "-1"); exit(); @@ -113,11 +102,7 @@ else if ($dopost == "export") { $winform = $win->GetWindow("hand", ""); $win->Display(); exit(); -} -/*---------------- -function __ExportIn() ------------------*/ -else if ($dopost == "exportin") { +} else if ($dopost == "exportin") { $wintitle = "导入文档模型规则"; $wecome_info = "文档模型管理::导入文档模型规则"; $win = new OxWindow(); @@ -128,11 +113,7 @@ else if ($dopost == "exportin") { $winform = $win->GetWindow("ok"); $win->Display(); exit(); -} -/*---------------- -function __ExportInOk() ------------------*/ -else if ($dopost == "exportinok") { +} else if ($dopost == "exportinok") { require_once(DEDEADMIN."/inc/inc_admin_channel.php"); function GotoStaMsg($msg) { @@ -222,11 +203,7 @@ else if ($dopost == "exportinok") { $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET listfields='$allfields' WHERE id='{$fields['newid']}' "); } GotoStaMsg("成功导入一个文档模型"); -} -/*---------------- -function __SaveCopy() ------------------*/ -else if ($dopost == "copysave") { +} else if ($dopost == "copysave") { $cid = intval($cid); $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$cid' ", MYSQL_ASSOC); foreach ($row as $k => $v) { @@ -257,11 +234,7 @@ else if ($dopost == "copysave") { ShowMsg("系统出错,请检查原因
错误提示:mychannel_edit.php?dopost=savecopy $errv", "javascript:;"); exit(); } -} -/*------------ -function __SaveEdit() -------------*/ -else if ($dopost == "save") { +} else if ($dopost == "save") { $fieldset = preg_replace("#[\r\n]{1,}#", "\r\n", $fieldset); $usertype = empty($usertype) ? '' : $usertype; $query = "UPDATE `#@__channeltype` SET typename='$typename',addtable='$addtable',addcon='$addcon',mancon='$mancon',editcon='$editcon',useraddcon='$useraddcon',usermancon='$usermancon',usereditcon='$usereditcon',fieldset='$fieldset',listfields='$listfields',issend='$issend',arcsta='$arcsta',usertype='$usertype',sendrank='$sendrank',needdes='$needdes',needpic='$needpic',titlename='$titlename',onlyone='$onlyone',dfcid='$dfcid' WHERE id='$id' "; @@ -282,11 +255,7 @@ else if ($dopost == "save") { $dsql->ExecuteNoneQuery($query); ShowMsg("成功修改一个文档模型", "mychannel_main.php"); exit(); -} -/*-------------------- -function __GetTemplate() ---------------------*/ -else if ($dopost == "gettemplets") { +} else if ($dopost == "gettemplets") { require_once(DEDEINC."/libraries/oxwindow.class.php"); $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'"); $wintitle = "文档模型管理-查看模板"; @@ -311,11 +280,7 @@ else if ($dopost == "gettemplets") { $winform = $win->GetWindow("hand", ""); $win->Display(); exit(); -} -/*-------------------- -function __Delete() ---------------------*/ -else if ($dopost == "delete") { +} else if ($dopost == "delete") { CheckPurview('c_Del'); $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'"); if ($row['issystem'] == 1) { @@ -346,7 +311,7 @@ else if ($dopost == "delete") { } //检查栏目的表是否独占数据表 $addtable = str_replace($cfg_dbprefix, '', str_replace('#@__', $cfg_dbprefix, $myrow['addtable'])); - $row = $dsql->GetOne("SELECT COUNT(id) AS dd FROM `#@__channeltype` WHERE addtable like '{$cfg_dbprefix}{$addtable}' OR addtable LIKE CONCAT('#','@','__','$addtable') ; "); + $row = $dsql->GetOne("SELECT COUNT(id) AS dd FROM `#@__channeltype` WHERE addtable like '{$cfg_dbprefix}{$addtable}' OR addtable LIKE CONCAT('#','@','__','$addtable') ;"); $isExclusive2 = ($row['dd'] > 1 ? 0 : 1); //获取与栏目关连的所有栏目id $tids = ''; @@ -356,18 +321,18 @@ else if ($dopost == "delete") { } //删除相关信息 if ($tids != '') { - $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE typeid IN($tids); "); - $dsql->ExecuteNoneQuery("DELETE FROM `{$myrow['maintable']}` WHERE typeid IN($tids); "); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__spec` WHERE typeid IN ($tids); "); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE typeid IN ($tids); "); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctype` WHERE id IN ($tids); "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE typeid IN($tids);"); + $dsql->ExecuteNoneQuery("DELETE FROM `{$myrow['maintable']}` WHERE typeid IN($tids);"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__spec` WHERE typeid IN ($tids);"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE typeid IN ($tids);"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctype` WHERE id IN ($tids);"); } //删除附加表或附加表内的信息 if ($isExclusive2 == 1) { $dsql->ExecuteNoneQuery("DROP TABLE IF EXISTS `{$cfg_dbprefix}{$addtable}`;"); } else { if ($tids != '' && $myrow['addtable'] != '') { - $dsql->ExecuteNoneQuery("DELETE FROM `{$myrow['addtable']}` WHERE typeid IN ($tids); "); + $dsql->ExecuteNoneQuery("DELETE FROM `{$myrow['addtable']}` WHERE typeid IN ($tids);"); } } //删除栏目配置信息 @@ -377,11 +342,7 @@ else if ($dopost == "delete") { ShowMsg("成功删除一个文档模型", "mychannel_main.php"); exit(); } -} //del -/*---------------- -function __modifysearch() ------------------*/ -else if ($dopost == 'modifysearch') { +} else if ($dopost == 'modifysearch') { if (!isset($step)) $step = 0; if (empty($step)) { $step = 1; @@ -573,7 +534,7 @@ else if ($dopost == 'modifysearch') { //删除自定义搜索; else if ($dopost == 'del') { $mid = intval($mid); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__advancedsearch` WHERE mid = '$mid'; "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__advancedsearch` WHERE mid = '$mid';"); ShowMsg("成功删除一个自定义搜索", "mychannel_main.php"); exit(); } diff --git a/src/admin/mychannel_field_add.php b/src/admin/mychannel_field_add.php index b55de26f..ebe93931 100644 --- a/src/admin/mychannel_field_add.php +++ b/src/admin/mychannel_field_add.php @@ -14,9 +14,6 @@ require_once(DEDEADMIN."/inc/inc_admin_channel.php"); require_once(DEDEINC."/dedetag.class.php"); if (empty($action)) $action = ''; $mysql_version = $dsql->GetVersion(); -/*---------------------- -function Save() ----------------------*/ if ($action == 'save') { //修改字段配置信息 $dfvalue = trim($vdefault); @@ -78,9 +75,6 @@ if ($action == 'save') { ShowMsg("成功增加一个字段", "mychannel_edit.php?id={$id}&dopost=edit&openfield=1"); exit(); } -/*---------------------- -function ShowPage() ----------------------*/ //检测模型相关信息,并初始化相关数据 $row = $dsql->GetOne("SELECT '#@__archives' AS maintable,addtable FROM `#@__channeltype` WHERE id='$id'"); $trueTable = $row['addtable']; diff --git a/src/admin/mychannel_field_edit.php b/src/admin/mychannel_field_edit.php index e9ed6022..da9fb227 100644 --- a/src/admin/mychannel_field_edit.php +++ b/src/admin/mychannel_field_edit.php @@ -39,9 +39,6 @@ while ($crow = $dsql->GetObject()) { $channelArray[$crow->id]['nid'] = $crow->nid; } //保存修改 -/*-------------------- -function _SAVE() -----------------------*/ if ($action == 'save') { if (!isset($fieldtypes[$dtype])) { ShowMsg("您修改的是系统专用类型的数据,禁止操作", "-1"); @@ -108,10 +105,7 @@ if ($action == 'save') { ShowMsg("成功修改一个字段的配置", "mychannel_edit.php?id={$id}&dopost=edit&openfield=1"); exit(); } -/*------------------ -删除字段 -function _DELETE() --------------------*/ +//删除字段 else if ($action == "delete") { if ($row['issystem'] == 1) { ShowMsg("系统模型的字段不允许删除", "-1"); diff --git a/src/admin/soft_add.php b/src/admin/soft_add.php index 75a7bcb6..ba6fb112 100644 --- a/src/admin/soft_add.php +++ b/src/admin/soft_add.php @@ -21,7 +21,7 @@ if ($dopost != 'save') { $cid = empty($cid) ? 0 : intval($cid); //获得栏目模型id if ($cid > 0 && $channelid == 0) { - $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid'; "); + $row = $dsql->GetOne("SELECT channeltype FROM `#@__arctype` WHERE id='$cid';"); $channelid = $row['channeltype']; } else { if ($channelid == 0) $channelid = 1; @@ -35,11 +35,7 @@ if ($dopost != 'save') { $maxWright = empty($maxWright)? array('cc'=>1) : $maxWright; include DedeInclude("templets/soft_add.htm"); exit(); -} -/*-------------------------------- -function __save(){ } --------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; diff --git a/src/admin/soft_config.php b/src/admin/soft_config.php index 1f6cd778..03d2de00 100644 --- a/src/admin/soft_config.php +++ b/src/admin/soft_config.php @@ -22,7 +22,7 @@ if ($dopost == "save") { //读取参数 $row = $dsql->GetOne("SELECT * FROM `#@__softconfig`"); if (!is_array($row)) { - $dsql->ExecuteNoneQuery("INSERT INTO `#@__softconfig` (`downtype`,`ismoresite`,`islocal`,`gotojump`,`sites`,`downmsg`,`moresitedo`,`dfrank`,`dfywboy`,`argrange`) VALUES ('1','0','1','0','','$downmsg','1','0','0','0'); "); + $dsql->ExecuteNoneQuery("INSERT INTO `#@__softconfig` (`downtype`,`ismoresite`,`islocal`,`gotojump`,`sites`,`downmsg`,`moresitedo`,`dfrank`,`dfywboy`,`argrange`) VALUES ('1','0','1','0','','$downmsg','1','0','0','0');"); $row['downtype'] = 1; $row['ismoresite'] = 0; $row['islocal'] = 1; diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php index ce36fb46..4d1810ef 100644 --- a/src/admin/soft_edit.php +++ b/src/admin/soft_edit.php @@ -65,11 +65,7 @@ if ($dopost != 'save') { $addRow = XSSClean($addRow); include DedeInclude("templets/soft_edit.htm"); exit(); -} -/*-------------------------------- -function __save(){ } --------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; diff --git a/src/admin/spec_add.php b/src/admin/spec_add.php index 6ed57faa..bc6bcbe7 100644 --- a/src/admin/spec_add.php +++ b/src/admin/spec_add.php @@ -23,11 +23,7 @@ if ($dopost != 'save') { $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid' "); include DedeInclude("templets/spec_add.htm"); exit(); -} -/*-------------------------------- -function __save(){ } --------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; diff --git a/src/admin/spec_edit.php b/src/admin/spec_edit.php index 1b91e3d4..5704b3dd 100644 --- a/src/admin/spec_edit.php +++ b/src/admin/spec_edit.php @@ -35,11 +35,7 @@ if ($dopost != 'save') { $addRow = $dsql->GetOne("SELECT * FROM `#@__addonspec` WHERE aid='$aid'"); $tags = GetTags($aid); include DedeInclude("templets/spec_edit.htm"); -} -/*-------------------------------- -function __save(){ } --------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; diff --git a/src/admin/stepselect_main.php b/src/admin/stepselect_main.php index 4c18f336..2eec5d4c 100644 --- a/src/admin/stepselect_main.php +++ b/src/admin/stepselect_main.php @@ -12,10 +12,7 @@ require_once(dirname(__FILE__)."/config.php"); CheckPurview('c_Stepselect'); require_once(DEDEINC."/datalistcp.class.php"); require_once(DEDEINC.'/enums.func.php'); -/*----------------- -前台视图 -function __show() { } -------------------*/ +//前台视图 $ENV_GOBACK_URL = (isset($ENV_GOBACK_URL) ? $ENV_GOBACK_URL : 'stepselect_main.php'); if (empty($action)) { setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); @@ -58,10 +55,7 @@ if (empty($action)) { include('./templets/stepselect_showajax.htm'); exit(); } -/*----------------- -删除类型或枚举值 -function __del() { } -------------------*/ +//删除类型或枚举值 else if ($action == 'del') { $arr = $dsql->GetOne("SELECT * FROM `#@__stepselect` WHERE id='$id' "); if (!is_array($arr)) { @@ -72,8 +66,8 @@ else if ($action == 'del') { ShowMsg("系统内置的枚举分类不能删除", "stepselect_main.php?".ExecTime()); exit(); } - $dsql->ExecuteNoneQuery("DELETE FROM `#@__stepselect` WHERE id='$id'; "); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE egroup='{$arr['egroup']}'; "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__stepselect` WHERE id='$id';"); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE egroup='{$arr['egroup']}';"); ShowMsg("成功删除一个分类", "stepselect_main.php?".ExecTime()); exit(); } else if ($action == 'delenumAllSel') { @@ -84,7 +78,7 @@ else if ($action == 'del') { while ($row = $dsql->GetArray('me')) { $groups[] = $row['egroup']; } - $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE id IN($id); "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE id IN($id);"); //更新缓存 foreach ($groups as $egropu) { WriteEnumsCache($egroup); @@ -96,28 +90,22 @@ else if ($action == 'del') { exit(); } else if ($action == 'delenum') { $row = $dsql->GetOne("SELECT egroup FROM `#@__sys_enum` WHERE id = '$id' "); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE id='{$id}'; "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE id='{$id}';"); WriteEnumsCache($row['egroup']); ShowMsg("成功删除一个枚举", $ENV_GOBACK_URL); exit(); } -/*----------------- -保存类型修改 -function __edit_save() { } -------------------*/ +//保存类型修改 else if ($action == 'edit_save') { if (preg_match("#[^0-9a-z_-]#i", $egroup)) { ShowMsg("组名称不能有全角字符或特殊符号", "-1"); exit(); } - $dsql->ExecuteNoneQuery("UPDATE `#@__stepselect` SET `itemname`='$itemname',`egroup`='$egroup' WHERE id='$id'; "); + $dsql->ExecuteNoneQuery("UPDATE `#@__stepselect` SET `itemname`='$itemname',`egroup`='$egroup' WHERE id='$id';"); ShowMsg("成功修改一个分类", "stepselect_main.php?".ExecTime()); exit(); } -/*----------------- -保存新类型 -function __addnew_save() { } -------------------*/ +//保存新类型 else if ($action == 'addnew_save') { if (preg_match("#[^0-9a-z_-]#i", $egroup)) { ShowMsg("组名称不能有全角字符或特殊符号", "-1"); @@ -128,25 +116,22 @@ else if ($action == 'addnew_save') { ShowMsg("您指定的类别名称或组名称已经存在,不能使用", "stepselect_main.php"); exit(); } - $dsql->ExecuteNoneQuery("INSERT INTO `#@__stepselect` (`itemname`,`egroup`,`issign`,`issystem`) VALUES ('$itemname','$egroup','0','0'); "); + $dsql->ExecuteNoneQuery("INSERT INTO `#@__stepselect` (`itemname`,`egroup`,`issign`,`issystem`) VALUES ('$itemname','$egroup','0','0');"); WriteEnumsCache($egroup); ShowMsg("成功添加一个分类", "stepselect_main.php?egroup=$egroup"); exit(); } -/*--------- -把旧版全国省市表替换当前地区数据 -function __exarea() { } -----------*/ +//旧版全国省市表替换当前地区数据 else if ($action == 'exarea') { $bigtypes = array(); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE egroup='nativeplace'; "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__sys_enum` WHERE egroup='nativeplace';"); $query = "SELECT * FROM `#@__area` WHERE reid =0 ORDER BY id ASC"; $dsql->Execute('me', $query); $n = 1; while ($row = $dsql->GetArray()) { $bigtypes[$row['id']] = $evalue = $disorder = $n * 500; $dsql->ExecuteNoneQuery("INSERT INTO `#@__sys_enum` (`ename`,`evalue`,`egroup`,`disorder`,`issign`) - VALUES ('{$row['name']}','$evalue','nativeplace','$disorder','0'); "); + VALUES ('{$row['name']}','$evalue','nativeplace','$disorder','0');"); $n++; } $stypes = array(); @@ -157,7 +142,7 @@ else if ($action == 'exarea') { while ($row = $dsql->GetArray()) { $stypes[$row['id']] = $evalue = $disorder = $v + $n; $dsql->ExecuteNoneQuery("INSERT INTO `#@__sys_enum` (`ename`,`evalue`,`egroup`,`disorder`,`issign`) - VALUES ('{$row['name']}','$evalue','nativeplace','$disorder','0'); "); + VALUES ('{$row['name']}','$evalue','nativeplace','$disorder','0');"); $n++; } } @@ -165,11 +150,7 @@ else if ($action == 'exarea') { ShowMsg("成功导入所有旧的地区数据", "stepselect_main.php?egroup=nativeplace"); exit(); } -/*-------------------- -function __addenum_save() { } -关于二级枚举:为了节省查询速度,二级枚举是通过特殊算法生成的,原理为凡是能被500整除的都是一级枚举(500 * n) + 1 < em < 500 * (n+1)为下级枚举,如:1000的下级枚举对应的值为 1001,1002,10031499对于issign=1的,表示这个类别只有一级枚举,则不受上面的算法限制 -更新算法:新增二级枚举下添加"-N"自己类别选择,例如:1001二级枚举下面的3级栏目,则为1001-1,1001-2这时候需要issign=2 ----------------------*/ +//关于二级枚举:为了节省查询速度,二级枚举是通过特殊算法生成的,原理为凡是能被500整除的都是一级枚举(500 * n) + 1 < em < 500 * (n+1)为下级枚举,如:1000的下级枚举对应的值为 1001,1002,10031499对于issign=1的,表示这个类别只有一级枚举,则不受上面的算法限制。更新算法:新增二级枚举下添加"-N"自己类别选择,例如:1001二级枚举下面的3级栏目,则为1001-1,1001-2这时候需要issign=2 else if ($action == 'addenum_save') { if (empty($ename) || empty($egroup)) { Showmsg("类别名称或组名称不能为空", "-1"); @@ -182,7 +163,7 @@ else if ($action == 'addenum_save') { if (!is_array($arr)) $disorder = $evalue = ($issign == 1 ? 1 : 500); else $disorder = $evalue = $arr['disorder'] + ($issign == 1 ? 1 : 500); $dsql->ExecuteNoneQuery("INSERT INTO `#@__sys_enum` (`ename`,`evalue`,`egroup`,`disorder`,`issign`) - VALUES ('$ename','$evalue','$egroup','$disorder','$issign'); "); + VALUES ('$ename','$evalue','$egroup','$disorder','$issign');"); } WriteEnumsCache($egroup); ShowMsg("成功添加枚举分类".$dsql->GetError(), $ENV_GOBACK_URL); @@ -225,17 +206,14 @@ else if ($action == 'addenum_save') { $evalue = $arr['evalue'] + 1; } $dsql->ExecuteNoneQuery("INSERT INTO `#@__sys_enum` (`ename`,`evalue`,`egroup`,`disorder`,`issign`) - VALUES ('$ename','$evalue','$egroup','$disorder','$issign'); "); + VALUES ('$ename','$evalue','$egroup','$disorder','$issign');"); } WriteEnumsCache($egroup); ShowMsg("成功添加枚举分类", $ENV_GOBACK_URL); exit(); } } -/*----------------- -修改枚举名称和排序 -function __upenum() { } -------------------*/ +//修改枚举名称和排序 else if ($action == 'upenum') { $ename = trim(preg_replace("# └─(─){1,}#", '', $ename)); $row = $dsql->GetOne("SELECT egroup FROM `#@__sys_enum` WHERE id = '$aid' "); @@ -244,10 +222,7 @@ else if ($action == 'upenum') { ShowMsg("成功修改一个枚举", $ENV_GOBACK_URL); exit(); } -/*----------------- -更新枚举缓存 -function __upallcache() { } -------------------*/ +//更新枚举缓存 else if ($action == 'upallcache') { if (!isset($egroup)) $egroup = ''; WriteEnumsCache($egroup); diff --git a/src/admin/swfupload.php b/src/admin/swfupload.php index f02650a8..9c68912e 100644 --- a/src/admin/swfupload.php +++ b/src/admin/swfupload.php @@ -141,7 +141,7 @@ else if ($dopost == 'del') { echo ''; exit(); } - $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE url LIKE '{$_SESSION['bigfile_info'][$id]}'; "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE url LIKE '{$_SESSION['bigfile_info'][$id]}';"); @unlink($cfg_basedir.$_SESSION['bigfile_info'][$id]); $_SESSION['file_info'][$id] = ''; $_SESSION['bigfile_info'][$id] = ''; @@ -176,7 +176,7 @@ else if ($dopost == 'delold') { if (!file_exists($imgfile) && !is_dir($imgfile) && preg_match("#^".$cfg_medias_dir."#", $imgfile)) { @unlink($imgfile); } - $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE url LIKE '{$picfile}'; "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__uploads` WHERE url LIKE '{$picfile}';"); echo "已删除"; exit(); } diff --git a/src/admin/sys_admin_user_add.php b/src/admin/sys_admin_user_add.php index 41598407..704dbce2 100644 --- a/src/admin/sys_admin_user_add.php +++ b/src/admin/sys_admin_user_add.php @@ -15,7 +15,7 @@ if (empty($dopost)) $dopost = ''; if ($dopost == 'add') { CheckCSRF(); if (preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd) || preg_match("#[^0-9a-zA-Z_@!\.-]#", $userid)) { - 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); @@ -25,7 +25,7 @@ if ($dopost == 'add') { } $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__member` WHERE userid LIKE '$userid' "); if ($row['dd'] > 0) { - ShowMsg('用户名已存在', '-1'); + ShowMsg('会员名已存在', '-1'); exit(); } $pfd = "pwd"; @@ -60,7 +60,7 @@ if ($dopost == 'add') { $adminquery = "Insert Into `#@__member_space` (`mid`,`pagesize`,`matt`,`spacename`,`spacelogo`,`spacestyle`,`sign`,`spacenews`) VALUES ('$mid','10','0','{$uname}的空间','','person','',''); "; $dsql->ExecuteNoneQuery($adminquery); - ShowMsg('成功增加一个用户', 'sys_admin_user.php'); + ShowMsg('成功增加一个会员', 'sys_admin_user.php'); exit(); } $randcode = mt_rand(10000, 99999); diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php index 9393a61b..218d081f 100644 --- a/src/admin/sys_admin_user_edit.php +++ b/src/admin/sys_admin_user_edit.php @@ -57,8 +57,8 @@ if ($dopost == 'saveedit') { $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); require_once(DEDEINC."/libraries/oxwindow.class.php"); - $wintitle = "删除用户"; - $wecome_info = "系统帐号管理::删除用户"; + $wintitle = "删除会员"; + $wecome_info = "系统帐号管理::删除会员"; $win = new OxWindow(); $win->Init("sys_admin_user_edit.php", "js/blank.js", "POST"); $win->AddHidden("dopost", $dopost); @@ -67,7 +67,7 @@ if ($dopost == 'saveedit') { $win->AddHidden("safecode", $safecode); $win->AddHidden("id", $id); $win->AddTitle("系统提示"); - $win->AddMsgItem("您确定要删除id$userid用户吗", "50"); + $win->AddMsgItem("您确定要删除id$userid会员吗", "50"); $win->AddMsgItem("验证安全码:(安全码:$safecode)", "30"); $winform = $win->GetWindow("ok"); $win->Display(); @@ -81,7 +81,7 @@ if ($dopost == 'saveedit') { //不能删除id为1的创建人帐号,不能删除自己 $rs = $dsql->ExecuteNoneQuery2("DELETE FROM `#@__admin` WHERE id='$id' AND id<>1 AND id<>'".$cuserLogin->getUserID()."' "); if ($rs > 0) { - //更新前台用户信息 + //更新前台会员信息 $dsql->ExecuteNoneQuery("UPDATE `#@__member` SET matt='0' WHERE mid='$id' LIMIT 1"); ShowMsg("成功删除一个帐户", "sys_admin_user.php"); } else { @@ -89,7 +89,7 @@ if ($dopost == 'saveedit') { } exit(); } -//显示用户信息 +//显示会员信息 $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); $typeOptions = ''; diff --git a/src/admin/sys_admin_user_tj.php b/src/admin/sys_admin_user_tj.php index bb0136e5..445ba1bc 100644 --- a/src/admin/sys_admin_user_tj.php +++ b/src/admin/sys_admin_user_tj.php @@ -11,7 +11,7 @@ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_User'); if (isset($dopost) && $dopost == 'getone') { - $row = $dsql->GetOne("SELECT userid FROM `#@__admin` WHERE id='$uid'; "); + $row = $dsql->GetOne("SELECT userid FROM `#@__admin` WHERE id='$uid';"); $userid = $row['userid']; $y = intval(MyDate('Y', time())); $m = intval(MyDate('m', time())); @@ -22,11 +22,11 @@ if (isset($dopost) && $dopost == 'getone') { while ($frow = $dsql->GetArray('me')) { $dd = empty($dd) ? "0" : $dd; $cc = empty($cc) ? "0" : $cc; - $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE mid='$uid'; "); + $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE mid='$uid';"); $dd += $row['dd']; $cc += $row['cc']; } - $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE mid='$uid'; "); + $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE mid='$uid';"); $dd = $row['dd'] + $dd; $cc = $row['cc'] + $cc; //季度 @@ -41,11 +41,11 @@ if (isset($dopost) && $dopost == 'getone') { while ($frow = $dsql->GetArray('me')) { $dds = empty($dds) ? "0" : $dds; $ccs = empty($ccs) ? "0" : $ccs; - $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid'; "); + $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid';"); $dds += $row['dd']; $ccs += $row['cc']; } - $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid'; "); + $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid';"); $dds = $row['dd'] + $dds; $ccs = $row['cc'] + $ccs; //当月 @@ -56,11 +56,11 @@ if (isset($dopost) && $dopost == 'getone') { while ($frow = $dsql->GetArray('me')) { $ddm = empty($ddm) ? "0" : $ddm; $ccm = empty($ccm) ? "0" : $ccm; - $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid'; "); + $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid';"); $ddm += $row['dd']; $ccm += $row['cc']; } - $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid'; "); + $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid';"); $ddm = $row['dd'] + $ddm; $ccm = $row['cc'] + $ccm; //本周 @@ -71,11 +71,11 @@ if (isset($dopost) && $dopost == 'getone') { while ($frow = $dsql->GetArray('me')) { $ddw = empty($ddw) ? "0" : $ddw; $ccw = empty($ccw) ? "0" : $ccw; - $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid'; "); + $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid';"); $ddw += $row['dd']; $ccw += $row['cc']; } - $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid'; "); + $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid';"); $ddw = $row['dd'] + $ddw; $ccw = $row['cc'] + $ccw; //当天 @@ -86,11 +86,11 @@ if (isset($dopost) && $dopost == 'getone') { while ($frow = $dsql->GetArray('me')) { $ddd = empty($ddd) ? "0" : $ddd; $ccd = empty($ccd) ? "0" : $ccd; - $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid'; "); + $row = $dsql->GetOne("SELECT COUNT(aid) AS dd,SUM(click) AS cc FROM `{$frow['addtable']}` WHERE senddate>$istarttime AND mid='$uid';"); $ddd += $row['dd']; $ccd += $row['cc']; } - $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid'; "); + $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid';"); $ddd = $row['dd'] + $ddd; $ccd = $row['cc'] + $ccd; $msg = " diff --git a/src/admin/sys_data_done.php b/src/admin/sys_data_done.php index 7f1534a7..5ec86af8 100644 --- a/src/admin/sys_data_done.php +++ b/src/admin/sys_data_done.php @@ -21,10 +21,7 @@ $bkdir = DEDEDATA.'/'.$cfg_backup_dir; //跳转一下页的js $gotojs = "function GotoNextPage(){document.gonext."."submit();}"."\r\nset"."Timeout('GotoNextPage()',500);"; $dojs = ""; -/*-------------------- -备份数据 -function __bak_data(); ---------------------*/ +//备份数据 if ($dopost == 'bak') { if (empty($tablearr)) { ShowMsg('您没选中数据表', 'javascript:;'); @@ -180,10 +177,7 @@ if ($dopost == 'bak') { } //分页备份代码结束 } -/*------------------------- -还原数据 -function __re_data(); --------------------------*/ +//还原数据 else if ($dopost == 'redat') { if ($bakfiles == '') { ShowMsg('没指定任何要还原数据', 'javascript:;'); diff --git a/src/admin/sys_data_replace.php b/src/admin/sys_data_replace.php index 50c5395d..6b3aae3d 100644 --- a/src/admin/sys_data_replace.php +++ b/src/admin/sys_data_replace.php @@ -18,10 +18,7 @@ if (empty($action)) { require_once(DEDEADMIN."/templets/sys_data_replace.htm"); exit(); } -/*------------------------------- //列出数据库表里的字段 -function __getfields() ---------------------------------*/ else if ($action == 'getfields') { AjaxHead(); $dsql->GetTableFields($exptable); @@ -33,10 +30,7 @@ else if ($action == 'getfields') { echo ""; exit(); } -/*------------------------------- -//保存用户设置,清空会员数据 -function __Apply() ---------------------------------*/ +//保存会员设置,清空会员数据 else if ($action == 'apply') { $validate = empty($validate) ? '' : strtolower($validate); $svali = GetCkVdValue(); diff --git a/src/admin/sys_group_add.php b/src/admin/sys_group_add.php index 631f1614..398ee0dc 100644 --- a/src/admin/sys_group_add.php +++ b/src/admin/sys_group_add.php @@ -28,7 +28,7 @@ if (!empty($dopost)) { $AllPurviews = trim($AllPurviews); } $dsql->ExecuteNoneQuery("INSERT INTO `#@__admintype` (`rank`,typename,`system`,purviews) VALUES ('$rankid','$groupname', 0, '$AllPurviews');"); - ShowMsg("成功创建一个新的用户组", "sys_group.php"); + ShowMsg("成功创建一个新的会员组", "sys_group.php"); exit(); } include DedeInclude('templets/sys_group_add.htm'); diff --git a/src/admin/sys_group_edit.php b/src/admin/sys_group_edit.php index 9c833fa2..54fffa89 100644 --- a/src/admin/sys_group_edit.php +++ b/src/admin/sys_group_edit.php @@ -24,11 +24,11 @@ if ($dopost == 'save') { $purview = trim($purview); } $dsql->ExecuteNoneQuery("UPDATE `#@__admintype` SET typename='$typename',purviews='$purview' WHERE CONCAT(`rank`)='$rank'"); - ShowMsg('成功修改用户组的权限', 'sys_group.php'); + ShowMsg('成功修改会员组的权限', 'sys_group.php'); exit(); } else if ($dopost == 'del') { $dsql->ExecuteNoneQuery("DELETE FROM `#@__admintype` WHERE CONCAT(`rank`)='$rank' AND `system`='0';"); - ShowMsg("成功删除一个用户组", "sys_group.php"); + ShowMsg("成功删除一个会员组", "sys_group.php"); exit(); } $groupRanks = array(); diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php index e5154d71..7d049b6d 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -20,7 +20,7 @@ if (empty($dopost)) { $msg = "
diff --git a/src/admin/templets/content_batch_up.htm b/src/admin/templets/content_batch_up.htm index 613409ec..b7a4abbc 100644 --- a/src/admin/templets/content_batch_up.htm +++ b/src/admin/templets/content_batch_up.htm @@ -99,7 +99,7 @@ - + diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm index 746a4a11..3037db75 100644 --- a/src/admin/templets/index_body.htm +++ b/src/admin/templets/index_body.htm @@ -150,7 +150,7 @@ 对比版本更改的文件
-

本更新提供了重要的安全性更新,建议所有用户升级,软件更新覆盖以下文件,请做好备份。

+

本更新提供了重要的安全性更新,建议所有会员升级,软件更新覆盖以下文件,请做好备份。

正在加载
diff --git a/src/admin/templets/media_main.htm b/src/admin/templets/media_main.htm index 496a94fd..5ff5bf83 100644 --- a/src/admin/templets/media_main.htm +++ b/src/admin/templets/media_main.htm @@ -59,7 +59,7 @@
- 由于手动升级时用户没运行指定的SQL语句,或自动升级的遗漏处理或处理出错,可能会导致一些错误,使用本工具会自动检测并处理,本工具目前主要执行下面动作:
+ 由于手动升级时会员没运行指定的SQL语句,或自动升级的遗漏处理或处理出错,可能会导致一些错误,使用本工具会自动检测并处理,本工具目前主要执行下面动作:
1、修复/优化数据表;
2、更新缓存;
3、检测系统变量一致性
@@ -34,10 +34,7 @@ if (empty($dopost)) { $win->Display(); exit(); } -/*------------------- -数据结构常规检测 -function 1_test_db() { } ---------------------*/ +//数据结构常规检测 else if ($dopost == 1) { $win = new OxWindow(); $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); @@ -61,10 +58,7 @@ else if ($dopost == 1) { $win->Display(); exit(); } -/*------------------- -检测微表正确性并尝试修复 -function 2_test_arctiny() { } ---------------------*/ +//检测微表正确性并尝试修复 else if ($dopost == 2) { $msg = ''; $allarcnum = 0; @@ -132,10 +126,7 @@ else if ($dopost == 2) { $win->Display(); exit(); } -/*------------------- -高级方式修复微表,会删除不合法主键的文档 -function 3_re_arctiny() { } ---------------------*/ +//高级方式修复微表,会删除不合法主键的文档 else if ($dopost == 3) { $errnum = 0; $sql = " TRUNCATE TABLE `#@__arctiny`"; diff --git a/src/admin/task_do.php b/src/admin/task_do.php index f00c2acd..ce5d6a62 100644 --- a/src/admin/task_do.php +++ b/src/admin/task_do.php @@ -10,7 +10,7 @@ */ require(dirname(__FILE__).'/config.php'); $dopost = (!isset($dopost) ? '' : $dopost); -//返回到下一任务链接,特殊变量,除非知道作用,否则不能在任务传递中占用:f临时,仅为了方便网址结构,dopost当前任务指向下一个任务,由用户自行处理或在nextdo中自动获得,del上一次任务删除的变量,morejob设定后,表示当前任务需请求多次,会把 dopost和nextdo处理后转为doposttmp和nextdotmp,然后由用户自行处理 +//返回到下一任务链接,特殊变量,除非知道作用,否则不能在任务传递中占用:f临时,仅为了方便网址结构,dopost当前任务指向下一个任务,由会员自行处理或在nextdo中自动获得,del上一次任务删除的变量,morejob设定后,表示当前任务需请求多次,会把 dopost和nextdo处理后转为doposttmp和nextdotmp,然后由会员自行处理 function GetNextUrl($notallowArr = array('dopost', 'f', 'del')) { $reurl = "task_do.php?f=0"; diff --git a/src/admin/templets/content_att.htm b/src/admin/templets/content_att.htm index 167a95d3..1c7cd835 100644 --- a/src/admin/templets/content_att.htm +++ b/src/admin/templets/content_att.htm @@ -17,7 +17,7 @@
-
自定义属性使用说明:以往的版本中,网站首页、封面栏目的设计,都只能单调的用arclist标记把某栏目最新或按特定排序方式的文档无选择的读出来,这样做法存在很大的不足,例如,我希望在最顶部的地方显示我想要的文档,在以往的版本中是无法做到的,但使用自定义属性之后,只要给arclist标记加上att='自定义属性的id'的属性,然后在发布的时候对适合的文档选择专门的属性,那么使用arclist的地方就会按您的意愿显示指定的文档。注意事项:这个版本中att对应的字段是SET类型字段,因此为了数据安全起见不允许用户增加其它类型,但调用时允许使用组合条件att='c,p'表示推荐图片
+
自定义属性使用说明:以往的版本中,网站首页、封面栏目的设计,都只能单调的用arclist标记把某栏目最新或按特定排序方式的文档无选择的读出来,这样做法存在很大的不足,例如,我希望在最顶部的地方显示我想要的文档,在以往的版本中是无法做到的,但使用自定义属性之后,只要给arclist标记加上att='自定义属性的id'的属性,然后在发布的时候对适合的文档选择专门的属性,那么使用arclist的地方就会按您的意愿显示指定的文档。注意事项:这个版本中att对应的字段是SET类型字段,因此为了数据安全起见不允许会员增加其它类型,但调用时允许使用组合条件att='c,p'表示推荐图片
用户的登录id:会员的登录id: (网址uid=后面跟的id)
diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm index cf9f30a9..6415a9fc 100644 --- a/src/admin/templets/member_main.htm +++ b/src/admin/templets/member_main.htm @@ -47,10 +47,10 @@ - 所有用户 - 禁言用户 - 推荐用户 - 普通用户 + 所有会员 + 禁言会员 + 推荐会员 + 普通会员
@@ -63,7 +63,7 @@ 选择 mid - 头像/用户名 + 头像/会员名 昵称 等级 钱包积分 @@ -71,7 +71,7 @@ 地址/时间 操作 - {dede:datalist empty='暂无用户'} + {dede:datalist empty='暂无会员'} {dede:field.mid/} diff --git a/src/admin/templets/member_pm.htm b/src/admin/templets/member_pm.htm index 63f57219..9058c25d 100644 --- a/src/admin/templets/member_pm.htm +++ b/src/admin/templets/member_pm.htm @@ -4,7 +4,7 @@ - 用户短信管理 + 会员短信管理 @@ -14,7 +14,7 @@ - +
- +
- +
- + diff --git a/src/admin/templets/member_rank.htm b/src/admin/templets/member_rank.htm index 81b6ee69..dfa4656d 100644 --- a/src/admin/templets/member_rank.htm +++ b/src/admin/templets/member_rank.htm @@ -42,7 +42,7 @@ - + diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm index c1f581d1..9cce4613 100644 --- a/src/admin/templets/member_toadmin.htm +++ b/src/admin/templets/member_toadmin.htm @@ -19,7 +19,7 @@ } if (document.form2.uname.value == "") { document.form2.uname.focus(); - ShowMsg("用户昵称不能为空"); + ShowMsg("会员昵称不能为空"); return false; } } @@ -36,7 +36,7 @@ - + - ';?> + ';?> - + diff --git a/src/admin/templets/sys_admin_user.htm b/src/admin/templets/sys_admin_user.htm index cb00c69a..918a01bd 100644 --- a/src/admin/templets/sys_admin_user.htm +++ b/src/admin/templets/sys_admin_user.htm @@ -4,7 +4,7 @@ - 系统用户管理 + 系统会员管理 @@ -15,10 +15,10 @@
发送到: 填写用户登录的id(网址uid=后面跟着的id) 填写会员登录的id(网址uid=后面跟着的id)
标题: id<=5) { echo "系统"; } else {echo "用户";}?>id<=5) { echo "系统"; } else {echo "会员";}?> id == 3) echo 'disabled="disabled"';?> value="1" checked="checked"> 正在使用
头像/用户名/类型:头像/会员名/类型: 会员管理 > 查看会员
当前用户是关连网站管理员,谨慎操作
当前会员是关连网站管理员,谨慎操作
头像/用户名:头像/会员名: ";};echo "".$row['userid']."";?> @@ -163,7 +163,7 @@ 管理操作: 修改资料 - 用户面板 + 会员面板
- + diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm index 70d05fa8..da3d7f71 100644 --- a/src/admin/templets/sys_admin_user_add.htm +++ b/src/admin/templets/sys_admin_user_add.htm @@ -13,17 +13,17 @@
系统用户管理系统会员管理 增加管理员 - 用户组管理 + 会员组管理 绩效统计