会员中心调整，移除不必要的文件

src/install/sql-dfdata.txt

@@ -4082,7 +4082,6 @@ INSERT INTO `#@__sysconfig` VALUES('1','cfg_basehost','站点根网址','1','str
 ('746','cfg_album_mark','图集是否使用水印(小图也会受影响)','3','bool','N'),
 ('747','cfg_mb_feedcheck','会员动态是否需要审核','4','bool','N'),
 ('748','cfg_mb_msgischeck','会员状态是否需要审核','4','bool','N'),
-('749','cfg_mb_reginfo','注册是否需要完成详细资料的填写','4','bool','Y'),
 ('750','cfg_remote_site','是否启用远程站点','2','bool','N'),
 ('751','cfg_title_site','是否发布和编辑文档时远程发布(启用远程站点的前提下)','2','bool','N'),
 ('752','cfg_mysql_type','数据库类型（支持mysql和mysqli）','2','string','mysql'),

src/member/archives_sg_add.php

@@ -69,16 +69,6 @@ else if($dopost=='save')
         }
         
     }
-    
-    $faqkey = isset($faqkey) && is_numeric($faqkey) ? $faqkey : 0;
-    if($safe_faq_send == '1')
-    {
-        if($safefaqs[$faqkey]['answer'] != $safeanswer || $safeanswer=='')
-        {
-            ShowMsg('验证问题答案错误', '-1');
-            exit();
-        }
-    }
 
     // 校验CSRF
     CheckCSRF();

src/member/config.php

@@ -159,7 +159,7 @@ $pms = $dsql->GetOne("SELECT COUNT(*) AS nums FROM #@__member_pms WHERE toid='{$
  */
 function CheckRank($rank=0, $money=0, $needinfo=TRUE)
 {
-    global $cfg_ml,$cfg_memberurl,$cfg_mb_reginfo,$cfg_mb_spacesta;
+    global $cfg_ml,$cfg_memberurl,$cfg_mb_spacesta;
     if(!$cfg_ml->IsLogin())
     {
         header("Location:{$cfg_memberurl}/login.php?gourl=".urlencode(GetCurUrl()));
@@ -167,15 +167,6 @@ function CheckRank($rank=0, $money=0, $needinfo=TRUE)
     }
     else
     {
-        if($cfg_mb_reginfo == 'Y' && $needinfo)
-        {
-            //如果启用注册详细信息
-            if($cfg_ml->fields['spacesta'] == 0 || $cfg_ml->fields['spacesta'] == 1)
-            {
-                ShowMsg("尚未完成详细资料，请完善...","{$cfg_memberurl}/index_do.php?fmdo=user&dopost=regnew&step=2",0,1000);
-                exit;
-            }
-        }
         if($cfg_mb_spacesta == '-10')
         {
             //如果启用注册邮件验证

src/member/inc/archives_check.php

@@ -24,15 +24,6 @@ if (strtolower($vdcode) != $svali || $svali == '') {
 // 校验CSRF
 CheckCSRF();
 
-$faqkey = isset($faqkey) && is_numeric($faqkey) ? $faqkey : 0;
-$safe_faq_send = isset($safe_faq_send) && is_numeric($safe_faq_send) ? $safe_faq_send : 0;
-if ($safe_faq_send == '1') {
-    if ($safefaqs[$faqkey]['answer'] != $safeanswer || $safeanswer == '') {
-        ShowMsg('验证问题答案错误', '-1');
-        exit();
-    }
-}
-
 $flag = '';
 $autokey = $remote = $dellink = $autolitpic = 0;
 $userip = GetIP();

src/member/reg_new.php

@@ -19,13 +19,6 @@ $step = empty($step) ? 1 : intval($step);
 
 if ($step == 1) {
     if ($cfg_ml->IsLogin()) {
-        if ($cfg_mb_reginfo == 'Y') {
-            //如果启用注册详细信息
-            if ($cfg_ml->fields['spacesta'] == 0 || $cfg_ml->fields['spacesta'] == 1) {
-                ShowMsg("尚未完成详细资料，请完善...", "index_do.php?fmdo=user&dopost=regnew&step=2", 0, 1000);
-                exit;
-            }
-        }
         ShowMsg('你已经登录系统，无需重新注册！', 'index.php');
         exit();
     }
@@ -198,14 +191,8 @@ if ($step == 1) {
             //         @mail($email, $mailtitle, $mailbody, $headers);
             //     }
             // }//End 邮件验证
-
-            if ($cfg_mb_reginfo == 'Y' && $spaceSta >= 0) {
-                ShowMsg("完成基本信息的注册，接下来完善详细资料...", "index_do.php?fmdo=user&dopost=regnew&step=2", 0, 1000);
-                exit();
-            } else {
-                require_once(DEDEMEMBER . "/templets/reg-new3.htm");
-                exit;
-            }
+            ShowMsg('你已经登录系统，无需重新注册！', 'index.php');
+            exit;
         } else {
             ShowMsg("注册失败，请检查资料是否有误或与管理员联系！", "-1");
             exit();
@@ -217,56 +204,7 @@ if ($step == 1) {
         ShowMsg("尚未完成基本信息的注册,请返回重新填写！", "index_do.php?fmdo=user&dopost=regnew");
         exit;
     } else {
-        if ($cfg_ml->fields['spacesta'] == 2) {
-            ShowMsg('你已经登录系统，无需重新注册！', 'index.php');
-            exit;
-        }
-    }
-
-    if ($dopost == 'reginfo') {
-        //这里完成详细内容填写
-        $dede_fields = empty($dede_fields) ? '' : trim($dede_fields);
-        $dede_fieldshash = empty($dede_fieldshash) ? '' : trim($dede_fieldshash);
-        $modid = empty($modid) ? 0 : intval($modid);
-
-        if (!empty($dede_fields)) {
-            if ($dede_fieldshash != md5($dede_fields . $cfg_cookie_encode)) {
-                showMsg('数据校验不对，程序返回', '-1');
-                exit();
-            }
-        }
-        $modelform = $dsql->GetOne("SELECT * FROM `#@__member_model` WHERE id='$modid' ");
-        if (!is_array($modelform)) {
-            showmsg('模型表单不存在', '-1');
-            exit();
-        }
-        $inadd_f = '';
-        if (!empty($dede_fields)) {
-            $fieldarr = explode(';', $dede_fields);
-            if (is_array($fieldarr)) {
-                foreach ($fieldarr as $field) {
-                    if ($field == '') continue;
-                    $fieldinfo = explode(',', $field);
-                    if ($fieldinfo[1] == 'textdata') {
-                        ${$fieldinfo[0]} = FilterSearch(stripslashes(${$fieldinfo[0]}));
-                        ${$fieldinfo[0]} = addslashes(${$fieldinfo[0]});
-                    } else {
-                        if (empty(${$fieldinfo[0]})) ${$fieldinfo[0]} = '';
-                        ${$fieldinfo[0]} = GetFieldValue(${$fieldinfo[0]}, $fieldinfo[1], 0, 'add', '', 'diy', $fieldinfo[0]);
-                    }
-                    if ($fieldinfo[0] == "birthday") ${$fieldinfo[0]} = GetDateMk(${$fieldinfo[0]});
-                    $inadd_f .= ',' . $fieldinfo[0] . " ='" . ${$fieldinfo[0]} . "' ";
-                }
-            }
-        }
-
-        if ($dsql->executenonequery($query)) {
-            $dsql->ExecuteNoneQuery("UPDATE `#@__member` SET `spacesta`='2' WHERE `mid`='{$cfg_ml->M_ID}'");
-            // 清除缓存
-            $cfg_ml->DelCache($cfg_ml->M_ID);
-            require_once(DEDEMEMBER . "/templets/reg-new3.htm");
-            exit;
-        }
+        ShowMsg('你已经登录系统，无需重新注册！', 'index.php');
+        exit;
     }
-    require_once(DEDEMEMBER . "/templets/reg-new2.htm");
 }

src/member/templets/album_add.htm

@@ -111,20 +111,7 @@
                     <div id="uploadfield"></div>
                     <script language="JavaScript">MakeUpload(2);</script>
                     </p>
-                    <?php
-            if($safe_faq_send == '1'){
-              $faqkey = array_rand($safefaqs);
-            ?>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label">验证问题</label>
-              <div class="col-sm-10">
-                <?php echo $safefaqs[$faqkey]['question'];?> (答案:<?php echo $safefaqs[$faqkey]['answer'];?>)<input
-                        name="safeanswer" type="text" id="safeanswer" size="25" style='width:200px;' class="intxt" />
-                      <input type="hidden" name="faqkey" value="<?php echo $faqkey;?>" />
-              </div>
-            </div>
             <?php
-              }
               //游客强制加验证码，会员则判断后台开关
               if(preg_match("/3/",$safe_gdopen)){
             ?>

src/member/templets/album_edit.htm

@@ -159,20 +159,7 @@
                     <script language="JavaScript">
                       startNum = <?php echo $j; ?>;
                     </script>
-                    <?php
-            if($safe_faq_send == '1'){
-              $faqkey = array_rand($safefaqs);
-            ?>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label">验证问题</label>
-              <div class="col-sm-10">
-                <?php echo $safefaqs[$faqkey]['question'];?> (答案:<?php echo $safefaqs[$faqkey]['answer'];?>)<input
-                        name="safeanswer" type="text" id="safeanswer" size="25" style='width:200px;' class="intxt" />
-                      <input type="hidden" name="faqkey" value="<?php echo $faqkey;?>" />
-              </div>
-            </div>
             <?php
-              }
               //游客强制加验证码，会员则判断后台开关
               if(preg_match("/3/",$safe_gdopen)){
             ?>

src/member/templets/archives_add.htm

@@ -80,20 +80,7 @@
                   ?>
                   <!-- 表单操作区域 -->
                   <div class="contentShow postForm">
-                    <?php
-            if($safe_faq_send == '1'){
-              $faqkey = array_rand($safefaqs);
-            ?>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label">验证问题</label>
-              <div class="col-sm-10">
-                <?php echo $safefaqs[$faqkey]['question'];?> (答案:<?php echo $safefaqs[$faqkey]['answer'];?>)<input
-                        name="safeanswer" type="text" id="safeanswer" size="25" style='width:200px;' class="intxt" />
-                      <input type="hidden" name="faqkey" value="<?php echo $faqkey;?>" />
-              </div>
-            </div>
             <?php
-              }
               //游客强制加验证码，会员则判断后台开关
               if(preg_match("/3/",$safe_gdopen)){
             ?>

src/member/templets/archives_edit.htm

@@ -80,20 +80,7 @@
                   ?>
                   <!-- 表单操作区域 -->
                   <div class="contentShow postForm">
-                    <?php
-            if($safe_faq_send == '1'){
-              $faqkey = array_rand($safefaqs);
-            ?>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label">验证问题</label>
-              <div class="col-sm-10">
-                <?php echo $safefaqs[$faqkey]['question'];?> (答案:<?php echo $safefaqs[$faqkey]['answer'];?>)<input
-                        name="safeanswer" type="text" id="safeanswer" size="25" style='width:200px;' class="intxt" />
-                      <input type="hidden" name="faqkey" value="<?php echo $faqkey;?>" />
-              </div>
-            </div>
             <?php
-              }
               //游客强制加验证码，会员则判断后台开关
               if(preg_match("/3/",$safe_gdopen)){
             ?>

src/member/templets/archives_sg_add.htm

@@ -80,20 +80,7 @@
                   ?>
                   <!-- 表单操作区域 -->
                   <div class="contentShow postForm">
-                    <?php
-            if($safe_faq_send == '1'){
-              $faqkey = array_rand($safefaqs);
-            ?>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label">验证问题</label>
-              <div class="col-sm-10">
-                <?php echo $safefaqs[$faqkey]['question'];?> (答案:<?php echo $safefaqs[$faqkey]['answer'];?>)<input
-                        name="safeanswer" type="text" id="safeanswer" size="25" style='width:200px;' class="intxt" />
-                      <input type="hidden" name="faqkey" value="<?php echo $faqkey;?>" />
-              </div>
-            </div>
             <?php
-              }
               //游客强制加验证码，会员则判断后台开关
               if(preg_match("/3/",$safe_gdopen)){
             ?>

src/member/templets/archives_sg_edit.htm

@@ -68,20 +68,7 @@
                   ?>
                   <!-- 表单操作区域 -->
                   <div class="contentShow postForm">
-                    <?php
-            if($safe_faq_send == '1'){
-              $faqkey = array_rand($safefaqs);
-            ?>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label">验证问题</label>
-              <div class="col-sm-10">
-                <?php echo $safefaqs[$faqkey]['question'];?> (答案:<?php echo $safefaqs[$faqkey]['answer'];?>)<input
-                        name="safeanswer" type="text" id="safeanswer" size="25" style='width:200px;' class="intxt" />
-                      <input type="hidden" name="faqkey" value="<?php echo $faqkey;?>" />
-              </div>
-            </div>
             <?php
-              }
               //游客强制加验证码，会员则判断后台开关
               if(preg_match("/3/",$safe_gdopen)){
             ?>

src/member/templets/article_add.htm

@@ -84,20 +84,7 @@
                     <p>
                       <?php GetEditor("body","",350,"Member"); ?>
                     </p>
-                    <?php
-            if($safe_faq_send == '1'){
-              $faqkey = array_rand($safefaqs);
-            ?>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label">验证问题</label>
-              <div class="col-sm-10">
-                <?php echo $safefaqs[$faqkey]['question'];?> (答案:<?php echo $safefaqs[$faqkey]['answer'];?>)<input
-                        name="safeanswer" type="text" id="safeanswer" size="25" style='width:200px;' class="intxt" />
-                      <input type="hidden" name="faqkey" value="<?php echo $faqkey;?>" />
-              </div>
-            </div>
             <?php
-              }
               //游客强制加验证码，会员则判断后台开关
               if(preg_match("/3/",$safe_gdopen)){
             ?>

src/member/templets/article_edit.htm

@@ -88,20 +88,7 @@
                     <p>
                       <?php GetEditor("body",$addRow['body'],350,"Member"); ?>
                     </p>
-                    <?php
-            if($safe_faq_send == '1'){
-              $faqkey = array_rand($safefaqs);
-            ?>
-            <div class="form-group row">
-              <label class="col-sm-2 col-form-label">验证问题</label>
-              <div class="col-sm-10">
-                <?php echo $safefaqs[$faqkey]['question'];?> (答案:<?php echo $safefaqs[$faqkey]['answer'];?>)<input
-                        name="safeanswer" type="text" id="safeanswer" size="25" style='width:200px;' class="intxt" />
-                      <input type="hidden" name="faqkey" value="<?php echo $faqkey;?>" />
-              </div>
-            </div>
             <?php
-              }
               //游客强制加验证码，会员则判断后台开关
               if(preg_match("/3/",$safe_gdopen)){
             ?>