DedeBIZ
/
DedeV6
关注 2
点赞 0
派生 0
代码 合并请求 0 版本发布 31 动态
浏览代码

调整文件，更新版本说明

tags/6.2.5
叙述、别离 2 年前
父节点
1ac1601b37
当前提交
3c6ea5f143
共有 36 个文件被更改，包括 81 次插入 和 216 次删除
分列视图
Diff 选项
显示统计 下载 Patch 文件 下载 Diff 文件
  1. +3
    -1
      docs/changelog.md
  2. +1
    -1
      src/admin/api.php
  3. +7
    -22
      src/admin/member_do.php
  4. +1
    -1
      src/admin/sys_cloud.php
  5. +1
    -1
      src/admin/sys_payment.php
  6. +8
    -14
      src/apps/notify.php
  7. +5
    -8
      src/apps/return.php
  8. +1
    -1
      src/install/install.html
  9. +0
    -1
      src/system/channelunit.class.php
  10. +4
    -4
      src/system/common.func.php
  11. +1
    -1
      src/system/database/dedesqlite.class.php
  12. +1
    -0
      src/system/userlogin.class.php
  13. +2
    -9
      src/user/album_add.php
  14. +1
    -8
      src/user/album_edit.php
  15. +1
    -1
      src/user/api.php
  16. +1
    -8
      src/user/archives_add.php
  17. +5
    -20
      src/user/archives_do.php
  18. +1
    -8
      src/user/archives_edit.php
  19. +1
    -8
      src/user/archives_sg_add.php
  20. +1
    -8
      src/user/archives_sg_edit.php
  21. +1
    -8
      src/user/article_add.php
  22. +1
    -9
      src/user/article_edit.php
  23. +7
    -13
      src/user/buy_action.php
  24. +2
    -1
      src/user/inc/archives_check.php
  25. +2
    -1
      src/user/inc/archives_check_edit.php
  26. +2
    -1
      src/user/inc/inc_archives_functions.php
  27. +2
    -1
      src/user/inc/inc_batchup.php
  28. +2
    -1
      src/user/inc/inc_catalog_options.php
  29. +2
    -1
      src/user/inc/inc_list_functions.php
  30. +2
    -1
      src/user/inc/inc_pwd_functions.php
  31. +2
    -16
      src/user/index_do.php
  32. +1
    -7
      src/user/operation.php
  33. +6
    -14
      src/user/pm.php
  34. +1
    -1
      src/user/resetpassword.php
  35. +1
    -8
      src/user/soft_add.php
  36. +1
    -8
      src/user/soft_edit.php

+ 3
- 1
docs/changelog.md 查看文件

@@ -3,10 +3,12 @@

# V6.2.5beta
- 优化系统支付功能，增加微信支付、余额支付，加强支付宝、银行转账支付方式；
- 优化系统后台、用户中心，采用全新的 DedeBizAdmin主题风格，清爽简约优化用户操作体验；
- 优化系统后台，命名为DedeBizAdmin后台主题风格；
- 优化用户头像上传功能，优化会员中心用户资料编辑页；
- 优化会员中心用户内容投稿缩略图；
- 优化缩略图、图片裁剪函数；
- 调整前台模板，清爽简约优化用户操作体验；
- 调整后台文件说明；
- 修复模块删除卸载错误；

# V6.2.3


+ 1
- 1
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);
}
}


+ 7
- 22
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;
}


+ 1
- 1
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,


+ 1
- 1
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) {


+ 8
- 14
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;
}


+ 5
- 8
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;
}


+ 1
- 1
src/install/install.html 查看文件

@@ -50,7 +50,7 @@
<label for="dbtype" class="form-label">数据库类型<i class="ml-2 fa fa-question-circle text-warning" data-toggle="tooltip" title="数据库类型一般为MySQL，类型SQLite用于开发调试，不建议生产中使用"></i></label>
<select id="dbtype" name="dbtype" class="form-control form-select">
<option value="mysql" selected>MySQL</option>
<?php if(extension_loaded("sqlite3")) {;?><option value="sqlite">SQLite</option><?php }?>
<?php if (extension_loaded("sqlite3")) {;?><option value="sqlite">SQLite</option><?php }?>
</select>
</div>
<div class="form-group server">


+ 0
- 1
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;


+ 4
- 4
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';


+ 1
- 1
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();


+ 1
- 0
src/system/userlogin.class.php 查看文件

@@ -507,3 +507,4 @@ function GetSonIdsLogicUL($id, $sArr, $channel = 0, $addthis = FALSE)
}
}
}
?>

+ 2
- 9
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;


+ 1
- 8
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;


+ 1
- 1
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(


+ 1
- 8
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 = '';


+ 5
- 20
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 == "") {


+ 1
- 8
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 = '';


+ 1
- 8
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");
//游客需要校验验证码


+ 1
- 8
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 = '';


+ 1
- 8
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 = '';


+ 1
- 9
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 = '';


+ 7
- 13
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;
}


+ 2
- 1
src/user/inc/archives_check.php 查看文件

@@ -65,4 +65,5 @@ if ($cfg_mb_cktitle == 'Y') {
ShowMsg("请不要发布重复文档", "-1", "0", 5000);
exit();
}
}
}
?>

+ 2
- 1
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 = '';
}
}
?>

+ 2
- 1
src/user/inc/inc_archives_functions.php 查看文件

@@ -345,4 +345,5 @@ function GetCurContent(&$body)
}
$htd->Close();
return $body;
}
}
?>

+ 2
- 1
src/user/inc/inc_batchup.php 查看文件

@@ -182,4 +182,5 @@ function GetTruePath()
{
$truepath = $GLOBALS["cfg_basedir"];
return $truepath;
}
}
?>

+ 2
- 1
src/user/inc/inc_catalog_options.php 查看文件

@@ -102,4 +102,5 @@ function classification($mid, $mtypeid = 0, $channelid = 1)
$selected = '';
}
return $list;
}
}
?>

+ 2
- 1
src/user/inc/inc_list_functions.php 查看文件

@@ -125,4 +125,5 @@ function IsPicArchives($flag)
} else {
return '';
}
}
}
?>

+ 2
- 1
src/user/inc/inc_pwd_functions.php 查看文件

@@ -150,4 +150,5 @@ function sn($mid, $userid, $mailto, $send = 'Y')
else {
return ShowMsg('请10分钟后再重新申请', 'login.php');
}
}
}
?>

+ 2
- 16
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)) {


+ 1
- 7
src/user/operation.php 查看文件

@@ -1,6 +1,6 @@
<?php
/**
* 操作
* 交易操作
*
* @version $id:search.php 8:38 2010年7月9日 tianya $
* @package DedeBIZ.User
@@ -15,12 +15,6 @@ $menutype = 'mydede';
$menutype_son = 'op';
setcookie("ENV_GOBACK_URL", GetCurUrl(), time() + 3600, "/");
if (!isset($dopost)) $dopost = '';
/**
* 获取状态
*
* @param string $sta 状态ID
* @return string
*/
function GetSta($sta)
{
if ($sta == 0) return '未付款';


+ 6
- 14
src/user/pm.php 查看文件

@@ -48,33 +48,25 @@ if ($dopost == 'read') {
);
echo json_encode($result);
exit();
} else if($dopost == 'remove'){
} else if ($dopost == 'remove'){
$ids = preg_replace("#[^0-9,]#", "", $ids);
if($folder==='inbox')
{
if ($folder==='inbox') {
$boxsql="SELECT * FROM `#@__member_pms` WHERE id IN($ids) AND folder LIKE 'inbox' AND toid='{$cfg_ml->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);


+ 1
- 1
src/user/resetpassword.php 查看文件

@@ -35,7 +35,7 @@ if ($dopost == "") {
exit();
}
$member = member($mail, $userid);
//以邮件方式取回密码；
//以邮件方式取回密码
if ($type == 1) {
//判断系统邮件服务是否开启
if ($cfg_sendmail_bysmtp == "Y") {


+ 1
- 8
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


+ 1
- 8
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');
//分析处理附加表数据


撰写 预览
正在加载...
取消
保存