From 3c6ea5f1439e361d4c77d464f660b73522bf45d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Tue, 28 Feb 2023 10:40:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/changelog.md | 4 +++- src/admin/api.php | 2 +- src/admin/member_do.php | 29 ++++++------------------ src/admin/sys_cloud.php | 2 +- src/admin/sys_payment.php | 2 +- src/apps/notify.php | 22 +++++++----------- src/apps/return.php | 13 ++++------- src/install/install.html | 2 +- src/system/channelunit.class.php | 1 - src/system/common.func.php | 8 +++---- src/system/database/dedesqlite.class.php | 2 +- src/system/userlogin.class.php | 1 + src/user/album_add.php | 11 ++------- src/user/album_edit.php | 9 +------- src/user/api.php | 2 +- src/user/archives_add.php | 9 +------- src/user/archives_do.php | 25 ++++---------------- src/user/archives_edit.php | 9 +------- src/user/archives_sg_add.php | 9 +------- src/user/archives_sg_edit.php | 9 +------- src/user/article_add.php | 9 +------- src/user/article_edit.php | 10 +------- src/user/buy_action.php | 20 ++++++---------- src/user/inc/archives_check.php | 3 ++- src/user/inc/archives_check_edit.php | 3 ++- src/user/inc/inc_archives_functions.php | 3 ++- src/user/inc/inc_batchup.php | 3 ++- src/user/inc/inc_catalog_options.php | 3 ++- src/user/inc/inc_list_functions.php | 3 ++- src/user/inc/inc_pwd_functions.php | 3 ++- src/user/index_do.php | 18 ++------------- src/user/operation.php | 8 +------ src/user/pm.php | 20 +++++----------- src/user/resetpassword.php | 2 +- src/user/soft_add.php | 9 +------- src/user/soft_edit.php | 9 +------- 36 files changed, 81 insertions(+), 216 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index ca928c0d..15e5b404 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -3,10 +3,12 @@ # V6.2.5beta - 优化系统支付功能,增加微信支付、余额支付,加强支付宝、银行转账支付方式; -- 优化系统后台、用户中心,采用全新的 DedeBizAdmin主题风格,清爽简约优化用户操作体验; +- 优化系统后台,命名为DedeBizAdmin后台主题风格; - 优化用户头像上传功能,优化会员中心用户资料编辑页; - 优化会员中心用户内容投稿缩略图; - 优化缩略图、图片裁剪函数; +- 调整前台模板,清爽简约优化用户操作体验; +- 调整后台文件说明; - 修复模块删除卸载错误; # V6.2.3 diff --git a/src/admin/api.php b/src/admin/api.php index d1520546..bca7bbc1 100644 --- a/src/admin/api.php +++ b/src/admin/api.php @@ -292,7 +292,7 @@ if ($action === 'is_need_check_code') { $srcFile = $backupVerPath.$f->filename; $dstFile = str_replace(array("\\", "//"), '/', DEDEROOT.$f->filename); $rs = @copy($srcFile, $dstFile); - if($rs) { + if ($rs) { unlink($srcFile); } } diff --git a/src/admin/member_do.php b/src/admin/member_do.php index cda9f990..ac060932 100644 --- a/src/admin/member_do.php +++ b/src/admin/member_do.php @@ -13,10 +13,7 @@ require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($dopost)) $dopost = ''; if (empty($fmdo)) $fmdo = ''; $ENV_GOBACK_URL = isset($_COOKIE['ENV_GOBACK_URL']) ? 'member_main.php' : ''; -/*---------------- -function __DelMember() -删除会员 -----------------*/ +//删除会员 if ($dopost == "delmember") { CheckPurview('member_Del'); if ($fmdo == 'yes') { @@ -121,10 +118,7 @@ if ($dopost == "delmember") { $winform = $win->GetWindow("ok"); $win->Display(); } -/*---------------- -function __Recommend() -推荐会员 -----------------*/ +//推荐会员 else if ($dopost == "recommend") { CheckPurview('member_Edit'); $id = preg_replace("#[^0-9]#", "", $id); @@ -138,10 +132,7 @@ else if ($dopost == "recommend") { exit(); } } -/*---------------- -function __EditUser() -修改会员 -----------------*/ +//修改会员 else if ($dopost == 'edituser') { CheckPurview('member_Edit'); $send_max = isset($send_max)? intval($send_max) : 0; @@ -174,10 +165,7 @@ else if ($dopost == 'edituser') { ShowMsg('成功修改会员资料', 'member_view.php?id='.$id); exit(); } -/*-------------- -function __LoginCP() -登录会员的控制面板 -----------*/ +//登录会员 else if ($dopost == "memberlogin") { CheckPurview('member_Edit'); PutCookie('DedeUserID', $id, 1800); @@ -217,7 +205,7 @@ else if ($dopost == "memberlogin") { $moRow = $dsql->GetOne("SELECT * FROM `#@__member_operation` WHERE aid='$var'"); if ($moRow['sta'] == 1) { if ($moRow['product'] === "card") { - //点卡 + //积分 $proRow = $dsql->GetOne("SELECT * FROM `#@__moneycard_type` WHERE tid={$moRow['pid']}"); $query = "UPDATE `#@__member` SET money = money+{$proRow['num']} WHERE mid = '{$moRow['mid']}'"; $dsql->ExecuteNoneQuery($query); @@ -226,19 +214,16 @@ else if ($dopost == "memberlogin") { $rank = $row['rank']; $exptime = $row['exptime']; $rs = $dsql->GetOne("SELECT uptime,exptime FROM `#@__member` WHERE mid='".$moRow['mid']."'"); - if($rs['uptime']!=0 && $rs['exptime']!=0 ) - { + if ($rs['uptime']!=0 && $rs['exptime']!=0) { $nowtime = time(); $mhasDay = $rs['exptime'] - ceil(($nowtime - $rs['uptime'])/3600/24) + 1; $mhasDay=($mhasDay>0)? $mhasDay : 0; } $memrank = $dsql->GetOne("SELECT money,scores FROM `#@__arcrank` WHERE `rank`='$rank'"); - //更新会员信息 $sqlm = "UPDATE `#@__member` SET `rank`='$rank',`money`=`money`+'{$memrank['money']}',scores=scores+'{$memrank['scores']}',exptime='$exptime'+'$mhasDay',uptime='".time()."' WHERE mid='".$moRow['mid']."'"; $sqlmo = "UPDATE `#@__member_operation` SET sta='2',oldinfo='会员升级成功' WHERE buyid='{$moRow['pid']}' "; - if(!($dsql->ExecuteNoneQuery($sqlm) && $dsql->ExecuteNoneQuery($sqlmo))) - { + if (!($dsql->ExecuteNoneQuery($sqlm) && $dsql->ExecuteNoneQuery($sqlmo))) { ShowMsg("升级会员失败", "javascript:;"); exit; } diff --git a/src/admin/sys_cloud.php b/src/admin/sys_cloud.php index b7685879..e51c9233 100644 --- a/src/admin/sys_cloud.php +++ b/src/admin/sys_cloud.php @@ -27,7 +27,7 @@ if ($dopost == "cloud_get") { )); } exit; -} else if($dopost == "cloud_set"){ +} else if ($dopost == "cloud_set"){ $config = array( "aliyun_enabled" => $aliyun_enabled, "aliyun_access_key_id" => $aliyun_access_key_id, diff --git a/src/admin/sys_payment.php b/src/admin/sys_payment.php index b36ec2d0..e95c8aa7 100644 --- a/src/admin/sys_payment.php +++ b/src/admin/sys_payment.php @@ -27,7 +27,7 @@ if ($dopost === "get_payments") { "data" => $payments, )); exit; -} else if($dopost === "save_config") { +} else if ($dopost === "save_config") { $json = file_get_contents("php://input"); $config = json_decode($json); foreach($config as $key => $item) { diff --git a/src/apps/notify.php b/src/apps/notify.php index d7992143..f5b6034c 100644 --- a/src/apps/notify.php +++ b/src/apps/notify.php @@ -31,13 +31,13 @@ if ($dopost === 'alipay') { ); //支付宝 try { - // 实例支付对象 + //实例支付对象 $pay = \AliPay\Web::instance($config); unset($_REQUEST['dopost']); unset($_REQUEST['sign_type']); $data = $pay->notify(false, $_REQUEST); if (isset($data['trade_no']) && !empty($data['trade_no'])) { - // $pay = \AliPay\Transfer::instance($config); + //$pay = \AliPay\Transfer::instance($config); $result = $pay->query($data['out_trade_no']); if ($result['trade_status']=== "TRADE_SUCCESS") { if ($moRow['product'] === "card") { @@ -46,24 +46,21 @@ if ($dopost === 'alipay') { $dsql->ExecuteNoneQuery($query); $query = "UPDATE `#@__member` SET money = money+{$row['num']} WHERE mid = '{$moRow['mid']}'"; $dsql->ExecuteNoneQuery($query); - } else if($moRow['product'] === "member"){ + } else if ($moRow['product'] === "member") { $row = $dsql->GetOne("SELECT * FROM `#@__member_type` WHERE aid='{$moRow['pid']}'"); $rank = $row['rank']; $exptime = $row['exptime']; $rs = $dsql->GetOne("SELECT uptime,exptime FROM `#@__member` WHERE mid='".$moRow['mid']."'"); - if($rs['uptime']!=0 && $rs['exptime']!=0 ) - { + if ($rs['uptime']!=0 && $rs['exptime']!=0) { $nowtime = time(); $mhasDay = $rs['exptime'] - ceil(($nowtime - $rs['uptime'])/3600/24) + 1; $mhasDay=($mhasDay>0)? $mhasDay : 0; } $memrank = $dsql->GetOne("SELECT money,scores FROM `#@__arcrank` WHERE `rank`='$rank'"); - //更新会员信息 $sqlm = "UPDATE `#@__member` SET `rank`='$rank',`money`=`money`+'{$memrank['money']}',scores=scores+'{$memrank['scores']}',exptime='$exptime'+'$mhasDay',uptime='".time()."' WHERE mid='".$moRow['mid']."'"; $sqlmo = "UPDATE `#@__member_operation` SET sta='2',oldinfo='会员升级成功' WHERE buyid='{$moRow['pid']}' "; - if(!($dsql->ExecuteNoneQuery($sqlm) && $dsql->ExecuteNoneQuery($sqlmo))) - { + if (!($dsql->ExecuteNoneQuery($sqlm) && $dsql->ExecuteNoneQuery($sqlmo))) { ShowMsg("升级会员失败", "javascript:;"); exit; } @@ -102,24 +99,21 @@ if ($dopost === 'alipay') { $dsql->ExecuteNoneQuery($query); $query = "UPDATE `#@__member` SET money = money+{$row['num']} WHERE mid = '{$moRow['mid']}'"; $dsql->ExecuteNoneQuery($query); - } else if($moRow['product'] === "member"){ + } else if ($moRow['product'] === "member") { $row = $dsql->GetOne("SELECT * FROM `#@__member_type` WHERE aid='{$moRow['pid']}'"); $rank = $row['rank']; $exptime = $row['exptime']; $rs = $dsql->GetOne("SELECT uptime,exptime FROM `#@__member` WHERE mid='".$moRow['mid']."'"); - if($rs['uptime']!=0 && $rs['exptime']!=0 ) - { + if ($rs['uptime']!=0 && $rs['exptime']!=0) { $nowtime = time(); $mhasDay = $rs['exptime'] - ceil(($nowtime - $rs['uptime'])/3600/24) + 1; $mhasDay=($mhasDay>0)? $mhasDay : 0; } $memrank = $dsql->GetOne("SELECT money,scores FROM `#@__arcrank` WHERE `rank`='$rank'"); - //更新会员信息 $sqlm = "UPDATE `#@__member` SET `rank`='$rank',`money`=`money`+'{$memrank['money']}',scores=scores+'{$memrank['scores']}',exptime='$exptime'+'$mhasDay',uptime='".time()."' WHERE mid='".$moRow['mid']."'"; $sqlmo = "UPDATE `#@__member_operation` SET sta='2',oldinfo='会员升级成功' WHERE buyid='{$moRow['pid']}' "; - if(!($dsql->ExecuteNoneQuery($sqlm) && $dsql->ExecuteNoneQuery($sqlmo))) - { + if (!($dsql->ExecuteNoneQuery($sqlm) && $dsql->ExecuteNoneQuery($sqlmo))) { ShowMsg("升级会员失败", "javascript:;"); exit; } diff --git a/src/apps/return.php b/src/apps/return.php index 321b7475..2efaee6a 100644 --- a/src/apps/return.php +++ b/src/apps/return.php @@ -31,13 +31,13 @@ if ($dopost === 'alipay') { ); //支付宝 try { - // 实例支付对象 + //实例支付对象 $pay = \AliPay\Web::instance($config); unset($_REQUEST['dopost']); unset($_REQUEST['sign_type']); $data = $pay->notify(); if (isset($data['trade_no']) && !empty($data['trade_no'])) { - // $pay = \AliPay\Transfer::instance($config); + //$pay = \AliPay\Transfer::instance($config); $result = $pay->query($data['out_trade_no']); if ($result['trade_status']=== "TRADE_SUCCESS") { if ($moRow['product'] === "card") { @@ -46,24 +46,21 @@ if ($dopost === 'alipay') { $dsql->ExecuteNoneQuery($query); $query = "UPDATE `#@__member` SET money = money+{$row['num']} WHERE mid = '{$moRow['mid']}'"; $dsql->ExecuteNoneQuery($query); - } else if($moRow['product'] === "member"){ + } else if ($moRow['product'] === "member") { $row = $dsql->GetOne("SELECT * FROM `#@__member_type` WHERE aid='{$moRow['pid']}'"); $rank = $row['rank']; $exptime = $row['exptime']; $rs = $dsql->GetOne("SELECT uptime,exptime FROM `#@__member` WHERE mid='".$moRow['mid']."'"); - if($rs['uptime']!=0 && $rs['exptime']!=0 ) - { + if ($rs['uptime']!=0 && $rs['exptime']!=0) { $nowtime = time(); $mhasDay = $rs['exptime'] - ceil(($nowtime - $rs['uptime'])/3600/24) + 1; $mhasDay=($mhasDay>0)? $mhasDay : 0; } $memrank = $dsql->GetOne("SELECT money,scores FROM `#@__arcrank` WHERE `rank`='$rank'"); - //更新会员信息 $sqlm = "UPDATE `#@__member` SET `rank`='$rank',`money`=`money`+'{$memrank['money']}',scores=scores+'{$memrank['scores']}',exptime='$exptime'+'$mhasDay',uptime='".time()."' WHERE mid='".$moRow['mid']."'"; $sqlmo = "UPDATE `#@__member_operation` SET sta='2',oldinfo='会员升级成功' WHERE buyid='{$moRow['pid']}' "; - if(!($dsql->ExecuteNoneQuery($sqlm) && $dsql->ExecuteNoneQuery($sqlmo))) - { + if (!($dsql->ExecuteNoneQuery($sqlm) && $dsql->ExecuteNoneQuery($sqlmo))) { ShowMsg("升级会员失败", "javascript:;"); exit; } diff --git a/src/install/install.html b/src/install/install.html index 2644dc6b..1382f6d1 100644 --- a/src/install/install.html +++ b/src/install/install.html @@ -50,7 +50,7 @@
diff --git a/src/system/channelunit.class.php b/src/system/channelunit.class.php index b808cff4..face7c89 100755 --- a/src/system/channelunit.class.php +++ b/src/system/channelunit.class.php @@ -11,7 +11,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); */ require_once(DEDEINC."/dedetag.class.php"); require_once(DEDEINC."/channelunit.func.php"); -//function C____ChannelUnit(); class ChannelUnit { var $ChannelInfos; diff --git a/src/system/common.func.php b/src/system/common.func.php index 75c3a238..adb54cbc 100755 --- a/src/system/common.func.php +++ b/src/system/common.func.php @@ -389,13 +389,13 @@ function GetSimpleServerSoftware() { if (preg_match("#^php#i",$_SERVER["SERVER_SOFTWARE"])) { return 'PHP Server'; - } else if(preg_match("#^apache#i",$_SERVER["SERVER_SOFTWARE"])){ + } else if (preg_match("#^apache#i",$_SERVER["SERVER_SOFTWARE"])){ return 'Apache'; - } else if(preg_match("#^nginx#i",$_SERVER["SERVER_SOFTWARE"])){ + } else if (preg_match("#^nginx#i",$_SERVER["SERVER_SOFTWARE"])){ return 'Nginx'; - } else if(preg_match("#^microsoft-iis#i",$_SERVER["SERVER_SOFTWARE"])){ + } else if (preg_match("#^microsoft-iis#i",$_SERVER["SERVER_SOFTWARE"])){ return 'IIS'; - } else if(preg_match("#^caddy#i",$_SERVER["SERVER_SOFTWARE"])){ + } else if (preg_match("#^caddy#i",$_SERVER["SERVER_SOFTWARE"])){ return 'Caddy'; } else { return 'Other'; diff --git a/src/system/database/dedesqlite.class.php b/src/system/database/dedesqlite.class.php index 2de449f3..eaa80492 100755 --- a/src/system/database/dedesqlite.class.php +++ b/src/system/database/dedesqlite.class.php @@ -397,7 +397,7 @@ class DedeSqlite //获取字段详细信息 function GetFieldObject($id = "me") { - if(!$this->result[$id]) { + if (!$this->result[$id]) { return false; } $cols = $this->result[$id]->numColumns(); diff --git a/src/system/userlogin.class.php b/src/system/userlogin.class.php index 7aa8d2e6..f0bfb562 100755 --- a/src/system/userlogin.class.php +++ b/src/system/userlogin.class.php @@ -507,3 +507,4 @@ function GetSonIdsLogicUL($id, $sArr, $channel = 0, $addthis = FALSE) } } } +?> \ No newline at end of file diff --git a/src/user/album_add.php b/src/user/album_add.php index d93f7955..9403c8dc 100755 --- a/src/user/album_add.php +++ b/src/user/album_add.php @@ -32,9 +32,6 @@ if ($cfg_ml->IsSendLimited()) { ShowMsg("投稿失败,剩余次数:{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } -/*------------- -function _ShowForm(){ } ---------------*/ if (empty($dopost)) { $query = "SELECT * FROM `#@__channeltype` WHERE id='$channelid'; "; $cInfos = $dsql->GetOne($query); @@ -54,11 +51,7 @@ if (empty($dopost)) { } include(DEDEMEMBER."/templets/album_add.htm"); exit(); -} -/*------------------------------ -function _SaveArticle(){ } -------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { include(DEDEMEMBER.'/inc/archives_check.php'); $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid'; "); $maxwidth = isset($maxwidth) && is_numeric($maxwidth) ? $maxwidth : 800; @@ -83,7 +76,7 @@ else if ($dopost == 'save') { $info = str_replace(array("\"", "'"), "`", $msg); $imgurls .= "{dede:img ddimg='' text='$info'} $u {/dede:img}\r\n"; } - } //循环结束 + }//循环结束 $imgurls = addslashes($imgurls); //分析处理附加表数据 $isrm = 1; diff --git a/src/user/album_edit.php b/src/user/album_edit.php index fab2bba0..e0c31efa 100755 --- a/src/user/album_edit.php +++ b/src/user/album_edit.php @@ -30,9 +30,6 @@ if ($cfg_ml->IsSendLimited()) { ShowMsg("投稿失败,剩余次数:{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } -/*------------- -function _ShowForm(){ } ---------------*/ if (empty($dopost)) { //读取归档信息 $arcQuery = "SELECT arc.*,ch.addtable,ch.fieldset,ch.arcsta FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' AND arc.mid='".$cfg_ml->M_ID."'; "; @@ -56,11 +53,7 @@ if (empty($dopost)) { $addRow = XSSClean($addRow); include(DEDEMEMBER."/templets/album_edit.htm"); exit(); -} -/*------------------------------ -function _Save(){ } -------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid'; "); $maxwidth = isset($maxwidth) && is_numeric($maxwidth) ? $maxwidth : 800; $pagepicnum = isset($pagepicnum) && is_numeric($pagepicnum) ? $pagepicnum : 12; diff --git a/src/user/api.php b/src/user/api.php index 3ca2d6e4..53d6fba5 100755 --- a/src/user/api.php +++ b/src/user/api.php @@ -58,7 +58,7 @@ if ($action === 'is_need_check_code') { "email" => $row['email'], ), )); -} else if($action === 'upload'){ +} else if ($action === 'upload') { if (!$cfg_ml->IsLogin()) { if ($format === 'json') { echo json_encode(array( diff --git a/src/user/archives_add.php b/src/user/archives_add.php index f56c2bed..14b0bb26 100755 --- a/src/user/archives_add.php +++ b/src/user/archives_add.php @@ -23,9 +23,6 @@ if ($cfg_ml->IsSendLimited()) { ShowMsg("投稿失败,剩余次数:{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } -/*------------- -function _ShowForm(){ } ---------------*/ if (empty($dopost)) { $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid'; "); if (!is_array($cInfos)) { @@ -48,11 +45,7 @@ if (empty($dopost)) { } include(DEDEMEMBER."/templets/archives_add.htm"); exit(); -} -/*------------------------------ -function _SaveArticle(){ } -------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { include(dirname(__FILE__).'/inc/archives_check.php'); //分析处理附加表数据 $inadd_f = $inadd_v = ''; diff --git a/src/user/archives_do.php b/src/user/archives_do.php index 0957b36e..2646489c 100755 --- a/src/user/archives_do.php +++ b/src/user/archives_do.php @@ -12,10 +12,7 @@ require_once(dirname(__FILE__)."/config.php"); if (empty($dopost)) $dopost = ''; $aid = isset($aid) && is_numeric($aid) ? $aid : 0; $channelid = isset($channelid) && is_numeric($channelid) ? $channelid : 1; -/*----------------- -function delStow() -删除收藏 -------------------*/ +//删除收藏 if ($dopost == "delStow") { CheckRank(0, 0); $type = empty($type) ? '' : HtmlReplace(trim($type), -1); @@ -32,10 +29,7 @@ if ($dopost == "delStow") { ShowMsg("成功删除一条收藏记录", $ENV_GOBACK_URL); exit(); } -/*----------------- -function addArchives() -添加投稿 -------------------*/ +//添加投稿 else if ($dopost == "addArc") { CheckRank(0, 0); if ($channelid == 1) { @@ -59,10 +53,7 @@ else if ($dopost == "addArc") { header("Location:$addcon"); exit(); } -/*----------------- -function editArchives() -修改投稿 -------------------*/ +//修改投稿 else if ($dopost == "edit") { CheckRank(0, 0); if ($channelid == 1) { @@ -86,10 +77,7 @@ else if ($dopost == "edit") { header("Location:$edit"."&aid=$aid"); exit(); } -/*-------------------- -function delArchives() -删除文档 ---------------------*/ +//删除文档 else if ($dopost == "delArc") { CheckRank(0, 0); include_once(DEDEMEMBER."/inc/inc_batchup.php"); @@ -145,10 +133,7 @@ else if ($dopost == "delArc") { } exit(); } -/*----------------- -function viewArchives() -查看文档 -------------------*/ +//查看文档 else if ($dopost == "viewArchives") { CheckRank(0, 0); if ($type == "") { diff --git a/src/user/archives_edit.php b/src/user/archives_edit.php index df0a31dc..f93f7f94 100755 --- a/src/user/archives_edit.php +++ b/src/user/archives_edit.php @@ -23,9 +23,6 @@ if ($cfg_ml->IsSendLimited()) { ShowMsg("投稿失败,剩余次数:{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } -/*------------- -function _ShowForm(){ } ---------------*/ if (empty($dopost)) { //读取归档信息 $arcQuery = "SELECT arc.*,ch.addtable,ch.fieldset,arc.mtype as mtypeid,ch.arcsta FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' And arc.mid='".$cfg_ml->M_ID."'; "; @@ -45,11 +42,7 @@ if (empty($dopost)) { $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='{$row['channel']}'; "); include(DEDEMEMBER."/templets/archives_edit.htm"); exit(); -} -/*------------------------------ -function _SaveArticle(){ } -------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { include(DEDEMEMBER.'/inc/archives_check_edit.php'); //分析处理附加表数据 $inadd_f = $inadd_m = ''; diff --git a/src/user/archives_sg_add.php b/src/user/archives_sg_add.php index 10a94fc6..173a77cb 100755 --- a/src/user/archives_sg_add.php +++ b/src/user/archives_sg_add.php @@ -23,9 +23,6 @@ if ($cfg_ml->IsSendLimited()) { ShowMsg("投稿失败,剩余次数:{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } -/*------------- -function _ShowForm(){ } ---------------*/ if (empty($dopost)) { $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid'; "); if (!is_array($cInfos)) { @@ -48,11 +45,7 @@ if (empty($dopost)) { } include(DEDEMEMBER."/templets/archives_sg_add.htm"); exit(); -} -/*------------------------------ -function _SaveArticle(){ } -------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { include_once(DEDEINC."/image.func.php"); include_once(DEDEINC."/libraries/oxwindow.class.php"); //游客需要校验验证码 diff --git a/src/user/archives_sg_edit.php b/src/user/archives_sg_edit.php index 15ec1a9e..af81660f 100755 --- a/src/user/archives_sg_edit.php +++ b/src/user/archives_sg_edit.php @@ -23,9 +23,6 @@ if ($cfg_ml->IsSendLimited()) { ShowMsg("投稿失败,剩余次数:{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } -/*------------- -function _ShowForm(){ } ---------------*/ if (empty($dopost)) { //读取归档信息 $arcQuery = "SELECT ch.*,arc.* FROM `#@__arctiny` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' "; @@ -42,11 +39,7 @@ if (empty($dopost)) { $addRow['id'] = $addRow['aid']; include(DEDEMEMBER."/templets/archives_sg_edit.htm"); exit(); -} -/*------------------------------ -function _SaveArticle(){ } -------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { require_once(DEDEINC."/image.func.php"); require_once(DEDEINC."/libraries/oxwindow.class.php"); $flag = ''; diff --git a/src/user/article_add.php b/src/user/article_add.php index 7699c680..9412927d 100755 --- a/src/user/article_add.php +++ b/src/user/article_add.php @@ -23,9 +23,6 @@ if ($cfg_ml->IsSendLimited()) { ShowMsg("投稿失败,剩余次数:{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } -/*------------- -function _ShowForm(){ } ---------------*/ if (empty($dopost)) { $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid'; "); //如果限制了会员级别或类型,则允许游客投稿选项无效 @@ -42,11 +39,7 @@ if (empty($dopost)) { } include(DEDEMEMBER."/templets/article_add.htm"); exit(); -} -/*------------------------------ -function _SaveArticle(){ } -------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { include(DEDEMEMBER.'/inc/archives_check.php'); //分析处理附加表数据 $inadd_f = $inadd_v = ''; diff --git a/src/user/article_edit.php b/src/user/article_edit.php index 9391baee..07aea828 100755 --- a/src/user/article_edit.php +++ b/src/user/article_edit.php @@ -23,9 +23,6 @@ if ($cfg_ml->IsSendLimited()) { ShowMsg("投稿失败,剩余次数:{$cfg_ml->M_SendMax}次", "-1", "0", 5000); exit(); } -/*------------- -function _ShowForm(){ } ---------------*/ if (empty($dopost)) { //读取归档信息 $arcQuery = "SELECT arc.*,ch.addtable,ch.fieldset,arc.mtype as mtypeid,ch.arcsta FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' And arc.mid='".$cfg_ml->M_ID."'; "; @@ -44,12 +41,7 @@ if (empty($dopost)) { $addRow = $dsql->GetOne("SELECT * FROM `{$row['addtable']}` WHERE aid='$aid'; "); include(DEDEMEMBER."/templets/article_edit.htm"); exit(); -} - -/*------------------------------ -function _SaveArticle(){ } -------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { include(DEDEMEMBER.'/inc/archives_check_edit.php'); //分析处理附加表数据 $inadd_f = $inadd_m = ''; diff --git a/src/user/buy_action.php b/src/user/buy_action.php index 1404fb49..05a6911d 100755 --- a/src/user/buy_action.php +++ b/src/user/buy_action.php @@ -64,29 +64,25 @@ if ($dopost === "bank_ok") { $dsql->ExecuteNoneQuery($query); $query = "UPDATE `#@__member` SET money = money+{$row['num']} WHERE mid = '$mid'"; $dsql->ExecuteNoneQuery($query); - } else if($moRow['product'] === "member"){ + } else if ($moRow['product'] === "member") { $row = $dsql->GetOne("SELECT * FROM `#@__member_type` WHERE aid='{$moRow['pid']}'"); $rank = $row['rank']; $exptime = $row['exptime']; $rs = $dsql->GetOne("SELECT uptime,exptime FROM `#@__member` WHERE mid='".$moRow['mid']."'"); - if($rs['uptime']!=0 && $rs['exptime']!=0 ) - { + if ($rs['uptime']!=0 && $rs['exptime']!=0) { $nowtime = time(); $mhasDay = $rs['exptime'] - ceil(($nowtime - $rs['uptime'])/3600/24) + 1; $mhasDay=($mhasDay>0)? $mhasDay : 0; } $memrank = $dsql->GetOne("SELECT money,scores FROM `#@__arcrank` WHERE `rank`='$rank'"); - //更新会员信息 $sqlm = "UPDATE `#@__member` SET `rank`='$rank',`money`=`money`+'{$memrank['money']}',scores=scores+'{$memrank['scores']}',exptime='$exptime'+'$mhasDay',uptime='".time()."' WHERE mid='".$moRow['mid']."'"; $sqlmo = "UPDATE `#@__member_operation` SET sta='2',oldinfo='会员升级成功' WHERE buyid='{$moRow['pid']}' "; - if(!($dsql->ExecuteNoneQuery($sqlm) && $dsql->ExecuteNoneQuery($sqlmo))) - { + if (!($dsql->ExecuteNoneQuery($sqlm) && $dsql->ExecuteNoneQuery($sqlmo))) { ShowMsg("升级会员失败", "javascript:;"); exit; } } - ShowMsg("已经完成付款", "index.php"); exit; } else { @@ -178,7 +174,7 @@ if ($paytype === 0) { ShowMsg("已完成支付,无需重复付款", "javascript:;"); exit; } - if($paytype === 1) { + if ($paytype === 1) { //微信支付 include_once(DEDEINC.'/libraries/oxwindow.class.php'); $pInfo = $dsql->GetOne("SELECT * FROM `#@__sys_payment` WHERE id = $paytype"); @@ -269,12 +265,11 @@ if ($paytype === 0) { $dsql->ExecuteNoneQuery($query); $query = "UPDATE `#@__member` SET user_money = user_money-{$row['money']} WHERE mid = '$mid'"; $dsql->ExecuteNoneQuery($query); - } else if($product == 'member'){ + } else if ($product == 'member') { $rank = $row['rank']; $exptime = $row['exptime']; $rs = $dsql->GetOne("SELECT uptime,exptime FROM `#@__member` WHERE mid='".$mid."'"); - if($rs['uptime']!=0 && $rs['exptime']!=0 ) - { + if ($rs['uptime']!=0 && $rs['exptime']!=0) { $nowtime = time(); $mhasDay = $rs['exptime'] - ceil(($nowtime - $rs['uptime'])/3600/24) + 1; $mhasDay=($mhasDay>0)? $mhasDay : 0; @@ -283,8 +278,7 @@ if ($paytype === 0) { //更新会员信息 $sqlm = "UPDATE `#@__member` SET `rank`='$rank',`money`=`money`+'{$memrank['money']}',scores=scores+'{$memrank['scores']}',exptime='$exptime'+'$mhasDay',uptime='".time()."' WHERE mid='".$mid."'"; $sqlmo = "UPDATE `#@__member_operation` SET sta='2',oldinfo='会员升级成功' WHERE buyid='$buyid' "; - if(!($dsql->ExecuteNoneQuery($sqlm) && $dsql->ExecuteNoneQuery($sqlmo))) - { + if (!($dsql->ExecuteNoneQuery($sqlm) && $dsql->ExecuteNoneQuery($sqlmo))) { ShowMsg("升级会员失败", "javascript:;"); exit; } diff --git a/src/user/inc/archives_check.php b/src/user/inc/archives_check.php index a32ec60a..bed3c894 100755 --- a/src/user/inc/archives_check.php +++ b/src/user/inc/archives_check.php @@ -65,4 +65,5 @@ if ($cfg_mb_cktitle == 'Y') { ShowMsg("请不要发布重复文档", "-1", "0", 5000); exit(); } -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/src/user/inc/archives_check_edit.php b/src/user/inc/archives_check_edit.php index d51c531e..6a0e84c2 100755 --- a/src/user/inc/archives_check_edit.php +++ b/src/user/inc/archives_check_edit.php @@ -56,4 +56,5 @@ if ($midRow['mid'] != $mid) { $isadmin = ($cfg_ml->fields['matt'] == 10 ? true : false); if (empty($oldlitpic)) { $oldlitpic = ''; -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/src/user/inc/inc_archives_functions.php b/src/user/inc/inc_archives_functions.php index 558b68d9..063cc026 100755 --- a/src/user/inc/inc_archives_functions.php +++ b/src/user/inc/inc_archives_functions.php @@ -345,4 +345,5 @@ function GetCurContent(&$body) } $htd->Close(); return $body; -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/src/user/inc/inc_batchup.php b/src/user/inc/inc_batchup.php index 87b3b584..d3fe938b 100755 --- a/src/user/inc/inc_batchup.php +++ b/src/user/inc/inc_batchup.php @@ -182,4 +182,5 @@ function GetTruePath() { $truepath = $GLOBALS["cfg_basedir"]; return $truepath; -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/src/user/inc/inc_catalog_options.php b/src/user/inc/inc_catalog_options.php index 7d3f8f09..26cddd4e 100755 --- a/src/user/inc/inc_catalog_options.php +++ b/src/user/inc/inc_catalog_options.php @@ -102,4 +102,5 @@ function classification($mid, $mtypeid = 0, $channelid = 1) $selected = ''; } return $list; -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/src/user/inc/inc_list_functions.php b/src/user/inc/inc_list_functions.php index 9adfef0d..27a2ff92 100755 --- a/src/user/inc/inc_list_functions.php +++ b/src/user/inc/inc_list_functions.php @@ -125,4 +125,5 @@ function IsPicArchives($flag) } else { return ''; } -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/src/user/inc/inc_pwd_functions.php b/src/user/inc/inc_pwd_functions.php index a9ed0dfb..0e090f8a 100755 --- a/src/user/inc/inc_pwd_functions.php +++ b/src/user/inc/inc_pwd_functions.php @@ -150,4 +150,5 @@ function sn($mid, $userid, $mailto, $send = 'Y') else { return ShowMsg('请10分钟后再重新申请', 'login.php'); } -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/src/user/index_do.php b/src/user/index_do.php index e27f6f62..8d6dac16 100755 --- a/src/user/index_do.php +++ b/src/user/index_do.php @@ -9,9 +9,6 @@ require_once(dirname(__FILE__)."/config.php"); if (empty($dopost)) $dopost = ''; if (empty($fmdo)) $fmdo = ''; -/********************* -function check_email() - *******************/ if ($fmdo == 'sendMail') { if (!CheckEmail($cfg_ml->fields['email'])) { ShowMsg('您的邮箱格式有错误', '-1'); @@ -72,11 +69,7 @@ if ($fmdo == 'sendMail') { $cfg_ml->DelCache($mid); ShowMsg('操作成功,请重新登录系统', 'login.php'); exit(); -} -/********************* -function Case_user() -*******************/ -else if ($fmdo == 'user') { +} else if ($fmdo == 'user') { //检查用户名是否存在 if ($dopost == "checkuser") { AjaxHead(); @@ -126,10 +119,7 @@ else if ($fmdo == 'user') { require_once(dirname(__FILE__)."/reg_new.php"); exit(); } - /*************************** //积分换金币 - function money2s() { } - ***************************/ else if ($dopost == "money2s") { CheckRank(0, 0); if ($cfg_money_scores == 0) { @@ -158,11 +148,7 @@ else if ($fmdo == 'user') { ShowMsg('成功兑换指定量的金币', 'operation.php'); exit(); } -} -/********************* -function login() -*******************/ -else if ($fmdo == 'login') { +} else if ($fmdo == 'login') { //用户登录 if ($dopost == "login") { if (!isset($vdcode)) { diff --git a/src/user/operation.php b/src/user/operation.php index 1df8bd92..9c8f6454 100755 --- a/src/user/operation.php +++ b/src/user/operation.php @@ -1,6 +1,6 @@ M_ID}'"; $dsql->SetQuery($boxsql); $dsql->Execute(); $query=''; while($row = $dsql->GetArray()) { - if($row && $row['isadmin']==1) - { + if ($row && $row['isadmin']==1) { $query = "UPDATE `#@__member_pms` SET writetime='0' WHERE id='{$row['id']}' AND folder='inbox' AND toid='{$cfg_ml->M_ID}' AND isadmin='1';"; $dsql->ExecuteNoneQuery($query); - } - else - { + } else { $query = "DELETE FROM `#@__member_pms` WHERE id in($ids) AND toid='{$cfg_ml->M_ID}' AND folder LIKE 'inbox'"; } } - } - else if($folder==='outbox') - { + } else if ($folder==='outbox') { $query = "DELETE FROM `#@__member_pms` WHERE id in($ids) AND fromid='{$cfg_ml->M_ID}' AND folder LIKE 'outbox' "; - } - else - { + } else { $query = "DELETE FROM `#@__member_pms` WHERE id in($ids) AND fromid='{$cfg_ml->M_ID}' Or toid='{$cfg_ml->M_ID}' AND folder LIKE 'outbox' Or (folder LIKE 'inbox' AND hasview='0')"; } $dsql->ExecuteNoneQuery($query); diff --git a/src/user/resetpassword.php b/src/user/resetpassword.php index d9cc9d29..5054b828 100755 --- a/src/user/resetpassword.php +++ b/src/user/resetpassword.php @@ -35,7 +35,7 @@ if ($dopost == "") { exit(); } $member = member($mail, $userid); - //以邮件方式取回密码; + //以邮件方式取回密码 if ($type == 1) { //判断系统邮件服务是否开启 if ($cfg_sendmail_bysmtp == "Y") { diff --git a/src/user/soft_add.php b/src/user/soft_add.php index ebc340d5..49f39cdd 100755 --- a/src/user/soft_add.php +++ b/src/user/soft_add.php @@ -23,9 +23,6 @@ require_once(DEDEMEMBER."/inc/inc_archives_functions.php"); $channelid = isset($channelid) && is_numeric($channelid) ? $channelid : 3; $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0; $menutype = 'content'; -/*------------- -function _ShowForm(){ } ---------------*/ if (empty($dopost)) { $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid'; "); if (!is_array($cInfos)) { @@ -48,11 +45,7 @@ if (empty($dopost)) { } include(DEDEMEMBER."/templets/soft_add.htm"); exit(); -} -/*------------------------------ -function _SaveArticle(){ } -------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { $description = ''; include(DEDEMEMBER.'/inc/archives_check.php'); //生成文档id diff --git a/src/user/soft_edit.php b/src/user/soft_edit.php index 1d155f83..4cf8e309 100755 --- a/src/user/soft_edit.php +++ b/src/user/soft_edit.php @@ -17,9 +17,6 @@ require_once(DEDEMEMBER."/inc/inc_archives_functions.php"); $channelid = isset($channelid) && is_numeric($channelid) ? $channelid : 3; $aid = isset($aid) && is_numeric($aid) ? $aid : 0; $menutype = 'content'; -/*------------- -function _ShowForm(){ } ---------------*/ if (empty($dopost)) { //读取归档信息 $arcQuery = "SELECT `#@__channeltype`.typename as channelname,`#@__arcrank`.membername as rankname,`#@__channeltype`.arcsta,`#@__archives`.* FROM `#@__archives` LEFT JOIN `#@__channeltype` ON `#@__channeltype`.id=`#@__archives`.channel LEFT JOIN `#@__arcrank` ON `#@__arcrank`.`rank`=`#@__archives`.arcrank WHERE `#@__archives`.id='$aid'"; @@ -67,11 +64,7 @@ if (empty($dopost)) { $tags = GetTags($aid); include(DEDEMEMBER."/templets/soft_edit.htm"); exit(); -} -/*------------------------------ -function _SaveArticle(){ } -------------------------------*/ -else if ($dopost == 'save') { +} else if ($dopost == 'save') { $description = ''; include(DEDEMEMBER.'/inc/archives_check_edit.php'); //分析处理附加表数据