结构调整

public/admin/member_do.php

@@ -198,7 +198,7 @@ else if ($dopost == "memberlogin") {
     CheckPurview('member_Edit');
     PutCookie('DedeUserID', $id, 1800);
     PutCookie('DedeLoginTime', time(), 1800);
-    if (empty($jumpurl)) header("location:../member/index.php");
+    if (empty($jumpurl)) header("location:../user/index.php");
     else header("location:$jumpurl");
 } else if ($dopost == "deoperations") {
     $nid = preg_replace('#[^0-9,]#', '', preg_replace('#`#', ',', $nid));

public/admin/templets/index_top2.htm

@@ -136,7 +136,7 @@ a:link,a:visited {
      			<a href="catalog_menu.php" target="menu">内容发布</a> |
      			<a href="index_body.php" target="main">系统主页</a> |
      			<a href="../index.php?upcache=1" target="_blank">网站主页</a> |  
-     			<a href="../member" target="_blank">会员中心</a> | 
+     			<a href="../user" target="_blank">会员中心</a> | 
       		<a href="exit.php" target="_top">注销</a>
        </dd>
 			</dl>

public/admin/templets/member_main.htm

@@ -98,7 +98,7 @@
       <tr height="26" align="center" bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
         <td><input name="mid" type="checkbox" id="mid" value="{dede:field.mid/}" class="np" /></td>
         <td>{dede:field.mid/}</td>
-        <td><a href="../member/index.php?uid={dede:field.userid/}" target='_blank'>
+        <td><a href="../user/index.php?uid={dede:field.userid/}" target='_blank'>
             <?php
 	  echo ''.$fields['userid'].'';
 	if($fields['spacesta']==-2) echo "<span style='color:#e74d58'>(禁言)</span>";

public/admin/templets/member_view.htm

@@ -187,11 +187,11 @@ function checkSubmit()
           <tr> 
             <td width="17%" align="right" class='bline'>特殊操作：</td>
             <td width="83%" class='bline'  style="text-align:left;">
-            <a href='member_do.php?dopost=memberlogin&id=<?php echo $row['mid']; ?>&jumpurl=../member/edit_fullinfo.php' target='_blank'>查看/修改详细资料</a>
+            <a href='member_do.php?dopost=memberlogin&id=<?php echo $row['mid']; ?>&jumpurl=../user/edit_fullinfo.php' target='_blank'>查看/修改详细资料</a>
             &nbsp;|&nbsp;
             <a href='member_do.php?dopost=memberlogin&id=<?php echo $row['mid']; ?>' target='_blank'>登录到此用户控制面板</a>
             &nbsp;|&nbsp;
-            <a href='../member/index.php?uid=<?php echo $row['userid']; ?>' target='_blank'>浏览此用户的空间</a>
+            <a href='../user/index.php?uid=<?php echo $row['userid']; ?>' target='_blank'>浏览此用户的空间</a>
             </td> 
           </tr>
           <tr> 

public/admin/templets/sys_info_pay.htm

@@ -19,7 +19,7 @@ var payment_image = new Array(
 <?php 
 $mch_temp = array();
 foreach($cfg_pay_info['type'] as $k => $val){ 
-	$mch_temp[] = '"../member/templets/images/pay/'.addslashes($cfg_pay_info['logo'][$k]).'"';
+	$mch_temp[] = '"../user/templets/images/pay/'.addslashes($cfg_pay_info['logo'][$k]).'"';
 }
 echo implode(",\n",$mch_temp);
 ?>
@@ -155,7 +155,7 @@ foreach($payment_arr as $value){
 <td align="left" bgcolor="#FFFFFF">
   <a id="payreg" href="http://union.tenpay.com/mch/mch_register.shtml?posid=22&actid=84&opid=50&whoid=31&sp_suggestuser=1202347401" target="_bank" style="margin-left:6px;">点击申请</a>
   <br>
-  <img src="../../member/images/pay/tenpay.jpg" id="regimage" />
+  <img src="../../user/images/pay/tenpay.jpg" id="regimage" />
   <p>
   <span id="paydes">财付通是腾讯公司为促进中国电子商务的发展需要，满足互联网用户价值需求，针对网上交易安全而精心推出的一系列服务</span>
   </p> </td>

public/plus/carbuyaction.php

@@ -228,7 +228,7 @@ if (!isset($dopost) || empty($dopost)) {
     if (preg_match("/S-P[0-9]+RN[0-9]/", $oid)) {
         $oid = trim($oid);
     } else {
-        ShowMsg("您的订单号不存在", "/member/shops_orders.php", 0, 2000);
+        ShowMsg("您的订单号不存在", "/user/shops_orders.php", 0, 2000);
         exit();
     }
 

public/plus/vote.php

@@ -18,7 +18,7 @@ $memberID = $member->M_LoginID;
 $time = time();
 $content = $memberID.'|'.$time;
 $file = DEDEDATA.'/cache/vote_'.$aid.'_'.$member->M_ID.'.inc'; //存放会员投票记录的缓存文件
-$loginurl = $cfg_basehost."/member";
+$loginurl = $cfg_basehost."/user";
 $ENV_GOBACK_URL = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
 if (empty($dopost)) $dopost = '';
 $aid = (isset($aid) && is_numeric($aid)) ? $aid : 0;

public/templets/muban/footer.htm

@@ -20,13 +20,13 @@
 <script>
     //校验是否登录
     function CheckLogin() {
-        $.get("{dede:global.cfg_cmsurl/}/member/ajax_loginsta.php?format=json",function(data) {
+        $.get("{dede:global.cfg_cmsurl/}/user/ajax_loginsta.php?format=json",function(data) {
             let result = JSON.parse(data);
             if (result.code === 200) {
                 $("#_login").html(`
                     欢迎，${result.data.username}
-                    <a class="ml-2" href="{dede:global.cfg_cmsurl/}/member/">[会员中心]</a>
-                    <a class="ml-2" href="{dede:global.cfg_cmsurl/}/member/index_do.php?fmdo=login&dopost=exit">[退出]</a>
+                    <a class="ml-2" href="{dede:global.cfg_cmsurl/}/user/">[会员中心]</a>
+                    <a class="ml-2" href="{dede:global.cfg_cmsurl/}/user/index_do.php?fmdo=login&dopost=exit">[退出]</a>
                 `);
                 $("#iptUsername").val(result.data.username);
                 $("#iptUsername").attr("disabled", "disabled");

public/templets/muban/list_infos.htm

@@ -122,7 +122,7 @@
 							<button type='submit' class="btn btn-warning btn-sm">搜索信息</button>
 							&nbsp;
 							<button type='button' class="btn btn-warning btn-sm"
-								onclick="location='/member/archives_sg_add.php?channelid=-8';">发布信息</button>
+								onclick="location='/user/archives_sg_add.php?channelid=-8';">发布信息</button>
 						</form>
 						{/dede:infoguide}
 					</div>

public/templets/muban/widget_article_feedback.htm

@@ -164,12 +164,12 @@
 				<button class="btn btn-success btnSend" type="button" onClick='SendReplyFeedback(${fid})'>回复</button>
 			</div>
 		</div>`;
-        $.get("{dede:global.cfg_cmsurl/}/member/ajax_loginsta.php?format=json", function(data) {
+        $.get("{dede:global.cfg_cmsurl/}/user/ajax_loginsta.php?format=json", function(data) {
             let result = JSON.parse(data);
             if (result.code !== 200) {
 				$(`._feedback_reply`).html("");
 				ShowAlert(`._feedback_reply[for="${fid}"]`, 
-				'回复需要登录会员中心，您可以<a href="{dede:global.cfg_cmsurl/}/member/login.php">[点击登录]</a>后再来回复', 'warning', 5000);
+				'回复需要登录会员中心，您可以<a href="{dede:global.cfg_cmsurl/}/user/login.php">[点击登录]</a>后再来回复', 'warning', 5000);
             } else {
 				$(`._feedback_reply`).html("");
 				$(`._feedback_reply[for="${fid}"]`).html(replyPannel);

public/templets/plus/carbuyaction.htm

@@ -20,7 +20,7 @@
       <?php if(!$cfg_ml->IsLogin()){ ?>
       <table cellpadding="0" cellspacing="0" class="table">
         <tr>
-          <td style="color:#F00">您好,欢迎来到本网站, 请 <a href="../member/login.php?gourl=<?php echo urlencode(GetCurUrl());?>">登录</a> 或 <a href="../member/index_do.php?fmdo=user&dopost=regnew">注册</a></td>
+          <td style="color:#F00">您好,欢迎来到本网站, 请 <a href="../user/login.php?gourl=<?php echo urlencode(GetCurUrl());?>">登录</a> 或 <a href="../user/index_do.php?fmdo=user&dopost=regnew">注册</a></td>
         </tr>
       </table>
       <?php }?>

public/templets/plus/view_msg_catalog.htm

@@ -19,7 +19,7 @@
 	<div class="sp-title">
 		<h2>提示信息</h2>
 		<span class="more">
-			<a href="../member">[会员中心]</a>
+			<a href="../user">[会员中心]</a>
 			&#160;
 			<a href="../">[返回首页]</a>
 		</span>

public/member/ajax_feedback.php → public/user/ajax_feedback.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @version        $Id: ajax_feedback.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/ajax_loginsta.php → public/user/ajax_loginsta.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @version        $Id: ajax_loginsta.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/album_add.php → public/user/album_add.php

@@ -3,7 +3,7 @@
  * 图集发布
  * 
  * @version        $Id: album_add.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/album_edit.php → public/user/album_edit.php

@@ -3,7 +3,7 @@
  * 图集编辑
  * 
  * @version        $Id: album_edit.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/archives_add.php → public/user/archives_add.php

@@ -3,7 +3,7 @@
  * 文档发布器
  * 
  * @version        $Id: archives_add.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/archives_do.php → public/user/archives_do.php

@@ -3,7 +3,7 @@
  * 文档管理
  * 
  * @version        $Id: archives_do.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/archives_edit.php → public/user/archives_edit.php

@@ -3,7 +3,7 @@
  * 文档编辑器
  * 
  * @version        $Id: archives_edit.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/archives_sg_add.php → public/user/archives_sg_add.php

@@ -3,7 +3,7 @@
  * 单表模型发布器
  * 
  * @version        $Id: archives_sg_add.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/archives_sg_edit.php → public/user/archives_sg_edit.php

@@ -3,7 +3,7 @@
  * 单表模型编辑器
  * 
  * @version        $Id: archives_sg_add.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/article_add.php → public/user/article_add.php

@@ -3,7 +3,7 @@
  * 发布文章
  * 
  * @version        $Id: article_add.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/article_edit.php → public/user/article_edit.php

@@ -3,7 +3,7 @@
  * 编辑文章
  * 
  * @version        $Id: article_edit.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/buy.php → public/user/buy.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @version        $Id: buy.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
@@ -25,7 +25,7 @@ while ($row = $dsql->GetObject()) {
     </tr>
     ";
 }
-$dsql->SetQuery("SELECT `#@__member_type`.*,`#@__arcrank`.membername,`#@__arcrank`.money as cm From `#@__member_type` LEFT JOIN `#@__arcrank` on `#@__arcrank`.rank = `#@__member_type`.rank ");
+$dsql->SetQuery("SELECT `#@__member_type`.*,`#@__arcrank`.membername,`#@__arcrank`.`money` as cm From `#@__member_type` LEFT JOIN `#@__arcrank` on `#@__arcrank`.`rank` = `#@__member_type`.`rank` ");
 $dsql->Execute();
 while ($row = $dsql->GetObject()) {
     $row->money = sprintf("%01.2f", $row->money);

public/member/buy_action.php → public/user/buy_action.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @version        $Id: buy_action.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/check_card.php → public/user/check_card.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @version        $Id: check_card.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/config.php → public/user/config.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @version        $Id: config.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/content_list.php → public/user/content_list.php

@@ -3,7 +3,7 @@
  * 内容列表
  * 
  * @version        $Id: content_list.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/content_sg_list.php → public/user/content_sg_list.php

@@ -3,7 +3,7 @@
  * 单表模型内容列表
  * 
  * @version        $Id: content_sg_list.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/edit_baseinfo.php → public/user/edit_baseinfo.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @version        $Id: edit_baseinfo.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/edit_email.php → public/user/edit_email.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @version        $Id: edit_email.php 2020/12/18 tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/edit_face.php → public/user/edit_face.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @version        $Id: edit_face.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/inc/archives_check.php → public/user/inc/archives_check.php

@@ -3,7 +3,7 @@
  * 文档验证
  * 
  * @version        $Id: archives_check.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/inc/archives_check_edit.php → public/user/inc/archives_check_edit.php

@@ -3,7 +3,7 @@
  * 文档编辑验证
  * 
  * @version        $Id: archives_check_edit.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/inc/config_pay_alipay.php → public/user/inc/config_pay_alipay.php

@@ -4,7 +4,7 @@ if (!defined('DEDEMEMBER')) exit('dedebiz');
  * 支付页面
  * 
  * @version        $Id: config_pay_alipay.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/inc/config_pay_tenpay.php → public/user/inc/config_pay_tenpay.php

@@ -47,7 +47,7 @@ $strTransactionId = $strSpid.$strBillDate.time();
 /*货币类型: 1 – RMB(人民币) 2 - USD(美元) 3 - HKD(港币)*/
 $strFeeType  = "1";
 /*财付通回调页面地址, 推荐使用ip地址的方式(最长255个字符)*/
-$strRetUrl  = $cfg_basehost."/member/paycenter/tenpay/notify_handler.php";
+$strRetUrl  = $cfg_basehost."/user/paycenter/tenpay/notify_handler.php";
 /*商户私有数据, 请求回调页面时原样返回*/
 $strAttach  = "my_magic_string";
 /*生成MD5签名*/

public/member/inc/config_pay_yeepay.php → public/user/inc/config_pay_yeepay.php

@@ -22,7 +22,7 @@ $p6_Pcat					= trim($ptype);
 #	商品描述
 $p7_Pdesc					= '';
 #	商户接收支付成功数据的地址,支付成功后易宝支付会向该地址发送两次成功通知.
-$p8_Url						= $cfg_basehost.'/member/paycenter/yeepay/callback.php';	
+$p8_Url						= $cfg_basehost.'/user/paycenter/yeepay/callback.php';	
 #	商户扩展信息
 ##商户可以任意填写1K 的字符串,支付成功时将原样返回.												
 $pa_MP						= 'member';

public/member/inc/config_space.php → public/user/inc/config_space.php

@@ -3,7 +3,7 @@
  * 空间配置
  * 
  * @version        $Id: config_space.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/inc/inc_archives_functions.php → public/user/inc/inc_archives_functions.php

@@ -3,7 +3,7 @@
  * 文档处理函数
  * 
  * @version        $Id: inc_archives_functions.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/inc/inc_batchup.php → public/user/inc/inc_batchup.php

@@ -4,7 +4,7 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * 文档操作处理函数
  * 
  * @version        $Id: inc_batchup.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/inc/inc_catalog_options.php → public/user/inc/inc_catalog_options.php

@@ -3,7 +3,7 @@
  * 单表模型发布器
  * 
  * @version        $Id: archives_sg_add.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/inc/inc_list_functions.php → public/user/inc/inc_list_functions.php

@@ -4,7 +4,7 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * 模型列表函数
  * 
  * @version        $Id: inc_list_functions.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/inc/inc_pwd_functions.php → public/user/inc/inc_pwd_functions.php

@@ -4,7 +4,7 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * 密码函数
  * 
  * @version        $Id: inc_pwd_functions.php 1 15:18 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/index.php → public/user/index.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @version        $Id: index.php 1 8:24 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/index_do.php → public/user/index_do.php

@@ -1,7 +1,7 @@
 <?php
 /**
      * @version        $Id: index_do.php 1 8:24 2010年7月9日Z tianya $
-     * @package        DedeBIZ.Member
+     * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
@@ -23,7 +23,7 @@ if ($fmdo == 'sendMail') {
         exit();
     }
     $userhash = md5($cfg_cookie_encode.'--'.$cfg_ml->fields['mid'].'--'.$cfg_ml->fields['email']);
-    $url = $cfg_basehost.(empty($cfg_cmspath) ? '/' : $cfg_cmspath)."/member/index_do.php?fmdo=checkMail&mid={$cfg_ml->fields['mid']}&userhash={$userhash}&do=1";
+    $url = $cfg_basehost.(empty($cfg_cmspath) ? '/' : $cfg_cmspath)."/user/index_do.php?fmdo=checkMail&mid={$cfg_ml->fields['mid']}&userhash={$userhash}&do=1";
     $url = preg_replace("#http:\/\/#i", '', $url);
     $url = 'http://'.preg_replace("#\/\/#i", '/', $url);
     $mailtitle = "{$cfg_webname}--会员邮件验证通知";

public/member/login.php → public/user/login.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @version        $Id: login.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/mypay.php → public/user/mypay.php

@@ -3,7 +3,7 @@
  * 交易支付
  * 
  * @version        $Id: mypay.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/mystow.php → public/user/mystow.php

@@ -3,7 +3,7 @@
  * 我的收藏夹
  * 
  * @version        $Id: mystow.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/operation.php → public/user/operation.php

@@ -3,7 +3,7 @@
  * 操作
  * 
  * @version        $Id: search.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/pm.php → public/user/pm.php

@@ -3,7 +3,7 @@
  * 会员短消息
  * 
  * @version        $Id: pm.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/reg_new.php → public/user/reg_new.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @version        $Id: reg_new.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/resetpassword.php → public/user/resetpassword.php

@@ -3,7 +3,7 @@
  * 密码重设
  * 
  * @version        $Id: resetpassword.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/shops_orders.php → public/user/shops_orders.php

@@ -3,7 +3,7 @@
  * 商品订单
  * 
  * @version        $Id: shops_orders.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/shops_point.php → public/user/shops_point.php

@@ -3,7 +3,7 @@
  * 商品支付点数
  * 
  * @version        $Id:shops_point.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
@@ -26,7 +26,7 @@ if (isset($oid)) {
 
     if ($dsql->ExecuteNoneQuery("UPDATE `#@__shops_orders` SET `state`='1' WHERE `oid`='$oid' AND `userid`='".$cfg_ml->M_ID."' AND `state`<1")) {
         $res = $dsql->ExecuteNoneQuery("UPDATE `#@__member` SET money=money-$priceCount WHERE mid='{$cfg_ml->M_ID}'");
-        ShowMsg("下单,支付成功,等待商家发货", "../member/shops_products.php?oid=".$oid);
+        ShowMsg("下单,支付成功,等待商家发货", "../user/shops_products.php?oid=".$oid);
         exit();
     } else {
         ShowMsg("支付失败,请联系管理员", "-1");

public/member/shops_products.php → public/user/shops_products.php

@@ -3,7 +3,7 @@
  * 商铺商品
  * 
  * @version        $Id:shops_products.php 1 8:38 2010年7月9日Z tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/soft_add.php → public/user/soft_add.php

@@ -3,7 +3,7 @@
  * 软件添加
  * 
  * @version        $Id: soft_add.php 2 14:16 2010-11-11 tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/soft_edit.php → public/user/soft_edit.php

@@ -3,7 +3,7 @@
  * 软件编辑
  * 
  * @version        $Id: soft_edit.php 2 14:16 2010-11-11 tianya $
- * @package        DedeBIZ.Member
+ * @package        DedeBIZ.User
  * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com

public/member/templets/footer.htm → public/user/templets/footer.htm

@@ -22,13 +22,13 @@
 <script>
     //校验是否登录
     function CheckLogin() {
-        $.get("<?php echo $cfg_cmsurl;?>/member/ajax_loginsta.php?format=json",function(data) {
+        $.get("<?php echo $cfg_cmsurl;?>/user/ajax_loginsta.php?format=json",function(data) {
             let result = JSON.parse(data);
             if (result.code === 200) {
                 $("#_login").html(`
                     欢迎，${result.data.username}
-                    <a class="ml-2" href="<?php echo $cfg_cmsurl;?>/member/">[会员中心]</a>
-                    <a class="ml-2" href="<?php echo $cfg_cmsurl;?>/member/index_do.php?fmdo=login&dopost=exit">[退出]</a>
+                    <a class="ml-2" href="<?php echo $cfg_cmsurl;?>/user/">[会员中心]</a>
+                    <a class="ml-2" href="<?php echo $cfg_cmsurl;?>/user/index_do.php?fmdo=login&dopost=exit">[退出]</a>
                 `);
                 $("#iptUsername").val(result.data.username);
                 $("#iptUsername").attr("disabled", "disabled");

public/member/templets/top_login.htm → public/user/templets/top_login.htm

@@ -10,7 +10,7 @@
           </a>
           <a><?php echo $cfg_ml->M_LoginID; ?>
           </a>
-          <a href="<?php echo $cfg_cmsurl;?>/member/index_do.php?fmdo=login&dopost=exit#" title="退出">
+          <a href="<?php echo $cfg_cmsurl;?>/user/index_do.php?fmdo=login&dopost=exit#" title="退出">
             <i class="fa fa-sign-out" aria-hidden="true"></i>
           </a>
         </div>

system/common.inc.php

@@ -18,7 +18,7 @@ define('DEDEINC', str_replace("\\", '/', dirname(__FILE__)));
 define('DEDEROOT', str_replace("\\", '/', substr(DEDEINC, 0, -6)).'public'); // 站点根目录
 define('BIZROOT', str_replace("\\", '/', substr(DEDEINC, 0, -6))); // BIZ根目录
 define('DEDEDATA', substr(DEDEINC, 0, -6).'data');
-define('DEDEMEMBER', DEDEROOT.'/member');
+define('DEDEMEMBER', DEDEROOT.'/user');
 define('DEDETEMPLATE', DEDEROOT.'/templets');
 define('DEDEBIZURL', "https://www.dedebiz.com");//Dede商业支持
 define('DEDEVER', 6);//当前系统大版本
@@ -175,7 +175,7 @@ $cfg_mobileurl = $cfg_mainsite.$cfg_mobile_dir;
 $cfg_data_dir = $cfg_cmspath.'/data';
 $cfg_dataurl = $cfg_mainsite.$cfg_data_dir;
 //会员目录
-$cfg_member_dir = $cfg_cmspath.'/member';
+$cfg_member_dir = $cfg_cmspath.'/user';
 $cfg_memberurl = $cfg_mainsite.$cfg_member_dir;
 //专题列表的存放路径
 $cfg_special = $cfg_cmspath.'/special';

system/memberlogin.class.php

@@ -474,7 +474,7 @@ class MemberLogin
         if ($this->M_Rank == 0) {
             $sta .= "您目前的身份是：普通会员";
         } else {
-            $row = $dsql->GetOne("Select membername From `#@__arcrank` where rank='".$this->M_Rank."'");
+            $row = $dsql->GetOne("Select membername From `#@__arcrank` where `rank`='".$this->M_Rank."'");
             $sta .= "您目前的身份是：".$row['membername'];
             $rs = $dsql->GetOne("Select id From `#@__admin` where userid='".$this->M_LoginID."'");
             if (!is_array($rs)) {

system/payment/alipay.php

@@ -182,15 +182,15 @@ class Alipay
         if($_GET['trade_status'] == 'TRADE_FINISHED' || $_GET['trade_status'] == 'WAIT_SELLER_SEND_GOODS' || $_GET['trade_status'] == 'TRADE_SUCCESS')
         {
             if($ordertype=="goods"){ 
-                if($this->success_db($order_sn))  return $msg = "支付成功!<br> <a href='/'>返回主页</a> <a href='/member'>会员中心</a>";
-                else  return $msg = "支付失败<br> <a href='/'>返回主页</a> <a href='/member'>会员中心</a>";
+                if($this->success_db($order_sn))  return $msg = "支付成功!<br> <a href='/'>返回主页</a> <a href='/user'>会员中心</a>";
+                else  return $msg = "支付失败<br> <a href='/'>返回主页</a> <a href='/user'>会员中心</a>";
             } else if ( $ordertype=="member" ) {
                 $oldinf = $this->success_mem($order_sn,$pname,$product,$pid);
-                return $msg = "<span style='color:#dc3545'>".$oldinf."</span><br> <a href='/'>返回主页</a> <a href='/member'>会员中心</a>";
+                return $msg = "<span style='color:#dc3545'>".$oldinf."</span><br> <a href='/'>返回主页</a> <a href='/user'>会员中心</a>";
             }
         } else {
             $this->log_result ("verify_failed");
-            return $msg = "支付失败<br> <a href='/'>返回主页</a> <a href='/member'>会员中心</a>";
+            return $msg = "支付失败<br> <a href='/'>返回主页</a> <a href='/user'>会员中心</a>";
         }
     }
 

system/payment/bank.php

@@ -17,7 +17,7 @@ class bank
     *
     * @return void
     */
-    var $orderurl = '../member/shops_products.php';
+    var $orderurl = '../user/shops_products.php';
     
     function bank()
     {
@@ -46,7 +46,7 @@ class bank
         $cart = new MemberShops();
         $cart->clearItem();
         $cart->MakeOrders();
-        if($payment=="member") $button="您可以 <a href='/'>返回首页</a> 或去 <a href='/member/operation.php'>会员中心</a>";
+        if($payment=="member") $button="您可以 <a href='/'>返回首页</a> 或去 <a href='/user/operation.php'>会员中心</a>";
         else $button="您可以 <a href='/' class='btn btn-success'>返回首页</a> 或去 <a class='btn btn-success' href='{$this->orderurl}?oid=".$order."'>查看订单</a>";
         return $button;
     }