会员中心页面调整

src/member/ajax_loginsta.php

@@ -9,13 +9,43 @@
 define('AJAXLOGIN', TRUE);
 
 require_once(dirname(__FILE__)."/config.php");
+
 AjaxHead();
-if($myurl == '') exit('');
+
+$format = isset($format)? "json" : "";
+
+if(!$cfg_ml->IsLogin())
+{
+    if ($format === 'json') {
+        echo json_encode(array(
+            "code" => -1,
+            "msg" => "尚未登录",
+            "data" => null,
+        ));
+    } else {
+        echo "";
+    }
+    exit;
+}
 
 $uid  = $cfg_ml->M_LoginID;
 
 !$cfg_ml->fields['face'] && $face = ($cfg_ml->fields['sex'] == '女')? 'dfgirl' : 'dfboy';
 $facepic = empty($face)? $cfg_ml->fields['face'] : $GLOBALS['cfg_memberurl'].'/templets/images/'.$face.'.png';
+
+if ($format === 'json') {
+    echo json_encode(array(
+        "code" => 200,
+        "msg" => "",
+        "data" => array(
+            "username" => $cfg_ml->M_UserName,
+            "myurl" => $myurl,
+            "facepic" => $facepic,
+            "memberurl" => $cfg_memberurl,
+        ),
+    ));
+    exit;
+}
 ?>
 <div class="userinfo">
     <div class="welcome">你好：<strong><?php echo $cfg_ml->M_UserName; ?></strong>，欢迎登录 </div>

src/member/album_add.php

@@ -90,70 +90,18 @@ else if($dopost=='save')
     $hasone = false;
     $ddisfirst=1;
 
-    //处理并保存所指定的图片从网上复制
-    if($formhtml==1)
-    {
-        $imagebody = stripslashes($imagebody);
-        $imgurls .= GetCurContentAlbum($imagebody,$copysource,$litpicname);
-        if($ddisfirst==1 && $litpic=='' && !empty($litpicname))
-        {
-            $litpic = $litpicname;
-            $hasone = true;
-        }
-    }
-    $info = '';
-
-    //正常上传
+    //只支持填写地址
     for($i=1;$i<=120;$i++)
     {
-        //含有图片的条件
-        if(isset($_FILES['imgfile'.$i]['tmp_name']) && is_uploaded_file($_FILES['imgfile'.$i]['tmp_name']) )
-        {
-            $iinfo = str_replace("'","`",stripslashes(${'imgmsg'.$i}));
-            if(!is_uploaded_file($_FILES['imgfile'.$i]['tmp_name']))
-            {
-                continue;
-            }
-            else
-            {
-                $sparr = Array("image/pjpeg","image/jpeg","image/gif","image/png","image/xpng","image/wbmp");
-                if(!in_array($_FILES['imgfile'.$i]['type'],$sparr))
-                {
-                    continue;
-                }
-                $filename = MemberUploads('imgfile'.$i,'',$cfg_ml->M_ID,'image','',0,0,false);
-                if($filename!='')
-                {
-                    SaveUploadInfo($title,$filename,1);
-                }
-
-                //缩图
-                if($pagestyle > 2)
-                {
-                    $litpicname = GetImageMapDD($filename,$ddmaxwidth);
-                    if($litpicname != '')
-                    {
-                        SaveUploadInfo($title.' 小图',$litpicname,1);
-                    }
-                }
-                else
-                {
-                    $litpicname = $filename;
-                }
-                $imgfile = $cfg_basedir.$filename;
-                if(is_file($imgfile))
-                {
-                    $iurl = $filename;
-                    $info = '';
-                    $imginfos = @getimagesize($imgfile,$info);
-                    $imgurls .= "{dede:img ddimg='$litpicname' text='$iinfo' width='".$imginfos[0]."' height='".$imginfos[1]."'} $iurl {/dede:img}\r\n";
-                }
-            }
-            if(!$hasone && $litpic=='' && !empty($litpicname))
-            {
-                $litpic = $litpicname;
-                $hasone = true;
-            }
+        if (!isset(${'imgfile'.$i})) {
+            continue;
+        }
+        $f = ${'imgfile'.$i};
+        $msg = isset(${'imgmsg'.$i})? ${'imgmsg'.$i} : "";
+        if (!empty($f) && filter_var($f, FILTER_VALIDATE_URL)) {
+            $u = str_replace(array("\"","'"), "`", $f);
+            $info = str_replace(array("\"","'"), "`", $msg);
+            $imgurls .= "{dede:img ddimg='' text='$info'} $u {/dede:img}\r\n";
         }
     }//循环结束
     $imgurls = addslashes($imgurls);
@@ -204,12 +152,6 @@ else if($dopost=='save')
         }
     }
 
-    //处理图片文档的自定义属性
-    if($litpic!='')
-    {
-        $flag = 'p';
-    }
-
     //生成文档ID
     $arcID = GetIndexKey($arcrank,$typeid,$sortrank,$channelid,$senddate,$mid);
     if(empty($arcID))
@@ -223,7 +165,7 @@ else if($dopost=='save')
     $inQuery = "INSERT INTO `#@__archives`(id,typeid,sortrank,flag,ismake,channel,arcrank,click,money,title,shorttitle,
 color,writer,source,litpic,pubdate,senddate,mid,description,keywords,mtype)
 VALUES ('$arcID','$typeid','$sortrank','$flag','$ismake','$channelid','$arcrank','0','$money','$title','$shorttitle',
-'$color','$writer','$source','$litpic','$pubdate','$senddate','$mid','$description','$keywords','$mtypesid'); ";
+'$color','$writer','$source','','$pubdate','$senddate','$mid','$description','$keywords','$mtypesid'); ";
     if(!$dsql->ExecuteNoneQuery($inQuery))
     {
         $gerr = $dsql->GetError();

src/member/album_edit.php

@@ -90,96 +90,18 @@ else if($dopost=='save')
     $hasone = false;
     $ddisfirst=1;
 
-    //处理并保存所指定的图片从网上复制
-    if($formhtml==1)
-    {
-        $imagebody = stripslashes($imagebody);
-        $imgurls .= GetCurContentAlbum($imagebody,$copysource,$litpicname);
-        if($ddisfirst==1 && $litpic=='' && !empty($litpicname))
-        {
-            $litpic = $litpicname;
-            $hasone = true;
-        }
-    }
-    $info = '';
-
-    //检查已上传或直接上传的图片
+    //只支持填写地址
     for($i=1;$i<=120;$i++)
     {
-        //含有图片的条件
-        if(isset(${'imgurl'.$i}) || (isset($_FILES['imgfile'.$i]['tmp_name']) && is_uploaded_file($_FILES['imgfile'.$i]['tmp_name'])))
-        {
-            $iinfo = str_replace("'","`",stripslashes(${'imgmsg'.$i}));
-            if(!is_uploaded_file($_FILES['imgfile'.$i]['tmp_name']))
-            {
-                $iurl = stripslashes(${'imgurl'.$i});
-
-                //如果有旧图
-                if(isset(${'imgurl'.$i}))
-                {
-                    $litpicname = $iurl;
-                    $filename = $iurl;
-
-                    //缩图
-                    if($pagestyle > 2)
-                    {
-                        $litpicname = GetImageMapDD($filename,$ddmaxwidth);
-                        if($litpicname != '')
-                        {
-                            SaveUploadInfo($title.' 小图',$litpicname,1);
-                        }
-                    }
-                }
-                else
-                {
-                    continue;
-                }
-            }
-            else
-            {
-                $sparr = Array("image/pjpeg","image/jpeg","image/gif","image/png","image/xpng","image/wbmp");
-                if(!in_array($_FILES['imgfile'.$i]['type'],$sparr))
-                {
-                    continue;
-                }
-                if(isset(${'imgurl'.$i}))
-                {
-                    $filename = ${'imgurl'.$i};
-                }
-                else
-                {
-                    $filename = '';
-                }
-                $filename = MemberUploads('imgfile'.$i,$filename,$cfg_ml->M_ID,'image','',0,0,false);
-                if($filename!='')
-                {
-                    SaveUploadInfo($title,$filename,1);
-                }
-                $litpicname = $filename;
-
-                //缩图
-                if($pagestyle > 2)
-                {
-                    $litpicname = GetImageMapDD($filename,$ddmaxwidth);
-                    if($litpicname != '')
-                    {
-                        SaveUploadInfo($title.' 小图',$litpicname,1);
-                    }
-                }
-            }
-            $imgfile = $cfg_basedir.$filename;
-            if(is_file($imgfile))
-            {
-                $iurl = $filename;
-                $info = '';
-                $imginfos = @getimagesize($imgfile,$info);
-                $imgurls .= "{dede:img ddimg='$litpicname' text='$iinfo' width='".$imginfos[0]."' height='".$imginfos[1]."'} $iurl {/dede:img}\r\n";
-            }
-            if(!$hasone && $litpic=='' && !empty($litpicname))
-            {
-                $litpic = $litpicname;
-                $hasone = true;
-            }
+        if (!isset(${'imgfile'.$i})) {
+            continue;
+        }
+        $f = ${'imgfile'.$i};
+        $msg = isset(${'imgmsg'.$i})? ${'imgmsg'.$i} : "";
+        if (!empty($f) && filter_var($f, FILTER_VALIDATE_URL)) {
+            $u = str_replace(array("\"","'"), "`", $f);
+            $info = str_replace(array("\"","'"), "`", $msg);
+            $imgurls .= "{dede:img ddimg='' text='$info'} $u {/dede:img}\r\n";
         }
     }//循环结束
     $imgurls = addslashes($imgurls);
@@ -222,8 +144,6 @@ else if($dopost=='save')
         }
     }
 	$description = HtmlReplace($description, -1);
-    //处理图片文档的自定义属性
-    if($litpic!='') $flag = 'p';
 
     //更新数据库的SQL语句
     //更新数据库的SQL语句
@@ -232,7 +152,6 @@ else if($dopost=='save')
              arcrank='$arcrank',
              typeid='$typeid',
              title='$title',
-             litpic='$litpic',
              description='$description',
              keywords='$keywords',
              mtype='$mtypesid',            

src/member/buy.php

@@ -13,7 +13,7 @@ $menutype_son = 'op';
 $myurl = $cfg_basehost.$cfg_member_dir.'/index.php?uid='.$cfg_ml->M_LoginID;
 $moneycards = '';
 $membertypes = '';
-$dsql->SetQuery("SELECT * FROM #@__moneycard_type ");
+$dsql->SetQuery("SELECT * FROM `#@__moneycard_type`");
 $dsql->Execute();
 while($row = $dsql->GetObject())
 {
@@ -26,7 +26,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())
 {

src/member/config.php

@@ -143,6 +143,10 @@ if($cfg_ml->IsLogin())
     if(!preg_match("#^http:#i", $myurl)) $myurl = $cfg_basehost.$myurl;
 }
 
+/** 有没新短信 **/
+$pms = $dsql->GetOne("SELECT COUNT(*) AS nums FROM #@__member_pms WHERE toid='{$cfg_ml->M_ID}' AND `hasview`=0 AND folder = 'inbox'");    
+
+
 /**
  *  检查用户是否有权限进行某个操作
  *

src/member/inc/inc_archives_functions.php

@@ -349,7 +349,7 @@ function GetCurContent(&$body)
     $htd = new DedeHttpDown();
     $basehost = "http://".$_SERVER["HTTP_HOST"];
     $img_array = array();
-    preg_match_all("/(src|SRC)=[\"|'| ]{0,}(http:\/\/([^>]*)\.(gif|jpg|png))/isU",$body,$img_array);
+    preg_match_all("/(src|SRC)=[\"|'| ]{0,}(http[s]?:\/\/([^>]*)\.(gif|jpg|png))/isU",$body,$img_array);
     $img_array = array_unique($img_array[2]);
     $imgUrl = $cfg_user_dir."/".$cfg_ml->M_ID;
     $imgPath = $cfg_basedir.$imgUrl;

src/member/inc/inc_pwd_functions.php

@@ -1,4 +1,4 @@
-<?php   if(!defined('DEDEMEMBER')) exit("dedecms");
+<?php if(!defined('DEDEMEMBER')) exit("dedecms");
 /**
  * 密码函数
  * 
@@ -78,7 +78,7 @@ function newmail($mid, $userid, $mailto, $type, $send)
     $mailtitle = $cfg_webname.":密码修改";
     $mailto = $mailto;
     $headers = "From: ".$cfg_adminemail."\r\nReply-To: $cfg_adminemail";
-    $mailbody = "亲爱的".$userid."：\r\n您好！感谢您使用".$cfg_webname."网。\r\n".$cfg_webname."应您的要求，重新设置密码：（注：如果您没有提出申请，请检查您的信息是否泄漏。）\r\n本次临时登陆密码为：".$randval." 请于三天内登陆下面网址确认修改。\r\n".$cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid;
+    $mailbody = "亲爱的".$userid."：\r\n您好！感谢您使用".$cfg_webname."网。\r\n".$cfg_webname."应您的要求，重新设置密码：（注：如果您没有提出申请，请检查您的信息是否泄漏。）\r\n本次临时登录密码为：".$randval." 请于三天内登录下面网址确认修改。\r\n".$cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid;
     if($type == 'INSERT')
     {
         $key = md5($randval);

src/member/index.php

@@ -83,15 +83,6 @@ if($uid=='')
         while ($row = $dsql->GetArray()) {
             $newfriends[] = $row;
         }
-
-        /** 好友记录 **/
-        $sql = "SELECT F.*,M.face,M.sex FROM `#@__member` AS M LEFT JOIN #@__member_friends AS F ON F.fid=M.mid WHERE F.mid='{$cfg_ml->M_ID}' ORDER BY F.addtime desc LIMIT 6";
-        $friends = array();
-        $dsql->SetQuery($sql);
-        $dsql->Execute();
-        while ($row = $dsql->GetArray()) {
-            $friends[] = $row;
-        }
         
         /** 有没新短信 **/
         $pms = $dsql->GetOne("SELECT COUNT(*) AS nums FROM #@__member_pms WHERE toid='{$cfg_ml->M_ID}' AND `hasview`=0 AND folder = 'inbox'");    
@@ -113,79 +104,4 @@ if($uid=='')
         $dpl->LoadTemplate($tpl);
         $dpl->display();
     }
-}
-
-/*-----------------------------
-//会员空间主页
-function space_index(){  }
-------------------------------*/
-else
-{
-    require_once(DEDEMEMBER.'/inc/config_space.php');
-    if($action == '')
-    {
-        include_once(DEDEINC."/channelunit.func.php");
-        $dpl = new DedeTemplate();
-        $tplfile = DEDEMEMBER."/space/{$_vars['spacestyle']}/index.htm";
-
-        //更新最近访客记录及站点统计记录
-        $vtime = time();
-        $last_vtime = GetCookie('last_vtime');
-        $last_vid = GetCookie('last_vid');
-        if(empty($last_vtime))
-        {
-            $last_vtime = 0;
-        }
-        if($vtime - $last_vtime > 3600 || !preg_match('#,'.$uid.',#i', ','.$last_vid.',') )
-        {
-            if($last_vid!='')
-            {
-                $last_vids = explode(',',$last_vid);
-                $i = 0;
-                $last_vid = $uid;
-                foreach($last_vids as $lsid)
-                {
-                    if($i>10)
-                    {
-                        break;
-                    }
-                    else if($lsid != $uid)
-                    {
-                        $i++;
-                        $last_vid .= ','.$last_vid;
-                    }
-                }
-            }
-            else
-            {
-                $last_vid = $uid;
-            }
-            PutCookie('last_vtime', $vtime, 3600*24, '/');
-            PutCookie('last_vid', $last_vid, 3600*24, '/');
-            if($cfg_ml->IsLogin() && $cfg_ml->M_LoginID != $uid)
-            {
-                $vip = GetIP();
-                $arr = $dsql->GetOne("SELECT * FROM `#@__member_vhistory` WHERE mid='{$_vars['mid']}' AND vid='{$cfg_ml->M_ID}' ");
-                if(is_array($arr))
-                {
-                    $dsql->ExecuteNoneQuery("UPDATE `#@__member_vhistory` SET vip='$vip',vtime='$vtime',count=count+1 WHERE mid='{$_vars['mid']}' AND vid='{$cfg_ml->M_ID}' ");
-                }
-                else
-                {
-                    $query = "INSERT INTO `#@__member_vhistory`(mid,loginid,vid,vloginid,count,vip,vtime)
-                             VALUES('{$_vars['mid']}','{$_vars['userid']}','{$cfg_ml->M_ID}','{$cfg_ml->M_LoginID}','1','$vip','$vtime'); ";
-                    $dsql->ExecuteNoneQuery($query);
-                }
-            }
-            $dsql->ExecuteNoneQuery("UPDATE `#@__member_tj` SET homecount=homecount+1 WHERE mid='{$_vars['mid']}' ");
-        }
-        $dpl->LoadTemplate($tplfile);
-        $dpl->display();
-        exit();
-    }
-    else
-    {
-        require_once(DEDEMEMBER.'/inc/space_action.php');
-        exit();
-    }
 }

src/member/index_do.php

@@ -96,30 +96,7 @@ else if($fmdo=='user')
             $msgtitle='用户笔名';
         }
         else
-        {
-            #api{{
-            if(defined('UC_API') && @include_once DEDEROOT.'/uc_client/client.php')
-            {
-                $ucresult = uc_user_checkname($uid);
-                if($ucresult > 0)
-                {
-                    echo "<font color='#4E7504'><b>√用户名可用</b></font>";
-                }
-                elseif($ucresult == -1)
-                {
-                    echo "<font color='red'><b>×用户名不合法</b></font>";
-                }
-                elseif($ucresult == -2)
-                {
-                    echo "<font color='red'><b>×包含要允许注册的词语</b></font>";
-                }
-                elseif($ucresult == -3)
-                {
-                    echo "<font color='red'><b>×用户名已经存在</b></font>";
-                }
-                exit();
-            }
-            #/aip}}            
+        {          
             $msgtitle='用户名';
         }
         if($cktype!=0 || $cfg_mb_wnameone=='N') {
@@ -143,24 +120,7 @@ else if($fmdo=='user')
     //检查email是否存在
     else  if($dopost=="checkmail")
     {
-        AjaxHead();
-        
-        #api{{
-        if(defined('UC_API') && @include_once DEDEROOT.'/uc_client/client.php')
-        {
-            $ucresult = uc_user_checkemail($email);
-            if($ucresult > 0) {
-                echo "<font color='#4E7504'><b>√可以使用</b></font>";
-            } elseif($ucresult == -4) {
-                echo "<font color='red'><b>×Email 格式有误！</b></font>";
-            } elseif($ucresult == -5) {
-                echo "<font color='red'><b>×Email 不允许注册！</b></font>";
-            } elseif($ucresult == -6) {
-                echo "<font color='red'><b>×该 Email 已经被注册！</b></font>";
-            }
-            exit();
-        }
-        #/aip}}    
+        AjaxHead(); 
         
         if($cfg_md_mailtest=='N')
         {
@@ -272,61 +232,7 @@ else if($fmdo=='login')
         }
 
         //检查帐号
-        $rs = $cfg_ml->CheckUser($userid,$pwd);  
-        
-        #api{{
-        if(defined('UC_API') && @include_once DEDEROOT.'/uc_client/client.php')
-        {
-            //检查帐号
-            list($uid, $username, $password, $email) = uc_user_login($userid, $pwd);
-            if($uid > 0) {
-                $password = md5($password);
-                //当UC存在用户,而CMS不存在时,就注册一个    
-                if(!$rs) {
-                    //会员的默认金币
-                    $row = $dsql->GetOne("SELECT `money`,`scores` FROM `#@__arcrank` WHERE `rank`='10' ");
-                    $scores = is_array($row) ? $row['scores'] : 0;
-                    $money = is_array($row) ? $row['money'] : 0;
-                    $logintime = $jointime = time();
-                    $loginip = $joinip = GetIP();
-                    $res = $dsql->ExecuteNoneQuery("INSERT INTO #@__member SET `mtype`='个人',`userid`='$username',`pwd`='$password',`uname`='$username',`sex`='男' ,`rank`='10',`money`='$money', `email`='$email', `scores`='$scores', `matt`='0', `face`='',`safequestion`='0',`safeanswer`='', `jointime`='$jointime',`joinip`='$joinip',`logintime`='$logintime',`loginip`='$loginip';");
-                    if($res) {
-                        $mid = $dsql->GetLastID();
-                        $data = array
-                        (
-                        0 => "INSERT INTO `#@__member_person` SET `mid`='$mid', `onlynet`='1', `sex`='男', `uname`='$username', `qq`='', `msn`='', `tel`='', `mobile`='', `place`='', `oldplace`='0' ,
-                                 `birthday`='1980-01-01', `star`='1', `income`='0', `education`='0', `height`='160', `bodytype`='0', `blood`='0', `vocation`='0', `smoke`='0', `marital`='0', `house`='0',
-                       `drink`='0', `datingtype`='0', `language`='', `nature`='', `lovemsg`='', `address`='',`uptime`='0';",
-                        1 => "INSERT INTO `#@__member_tj` SET `mid`='$mid',`article`='0',`album`='0',`archives`='0',`homecount`='0',`pagecount`='0',`feedback`='0',`friend`='0',`stow`='0';",
-                        2 => "INSERT INTO `#@__member_space` SET `mid`='$mid',`pagesize`='10',`matt`='0',`spacename`='{$uname}的空间',`spacelogo`='',`spacestyle`='person', `sign`='',`spacenews`='';",
-                        3 => "INSERT INTO `#@__member_flink` SET `mid`='$mid', `title`='织梦内容管理系统', `url`='http://www.dedecms.com';"
-                        );                        
-                        foreach($data as $val) $dsql->ExecuteNoneQuery($val);
-                    }
-                }
-                $rs = 1;
-                $row = $dsql->GetOne("SELECT `mid`, `pwd` FROM #@__member WHERE `userid`='$username'");
-                if(isset($row['mid']))
-                {
-                    $cfg_ml->PutLoginInfo($row['mid']);
-                    if($password!=$row['pwd']) $dsql->ExecuteNoneQuery("UPDATE #@__member SET `pwd`='$password' WHERE mid='$row[mid]'");
-                }
-                //生成同步登录的代码
-                $ucsynlogin = uc_user_synlogin($uid);
-            } else if($uid == -1) {
-                //当UC不存在该用而CMS存在,就注册一个.
-                if($rs) {
-                    $row = $dsql->GetOne("SELECT `email` FROM #@__member WHERE userid='$userid'");                    
-                    $uid = uc_user_register($userid, $pwd, $row['email']);
-                    if($uid > 0) $ucsynlogin = uc_user_synlogin($uid);
-                } else {
-                    $rs = -1;
-                }
-            } else {
-                $rs = -1;
-            }
-        }
-        #/aip}}        
+        $rs = $cfg_ml->CheckUser($userid,$pwd);    
         
         if($rs==0)
         {
@@ -365,56 +271,10 @@ else if($fmdo=='login')
     else if($dopost=="exit")
     {
         $cfg_ml->ExitCookie();
-        #api{{
-        if(defined('UC_API') && @include_once DEDEROOT.'/uc_client/client.php')
-        {
-            $ucsynlogin = uc_user_synlogout();
-        }
-        #/aip}}
         ShowMsg("成功退出登录！","index.php",0,2000);
         exit();
     }
 }
-/*********************
-function moodmsg()
-*******************/
-else if($fmdo=='moodmsg')
-{
-    //用户登录
-    if($dopost=="sendmsg")
-    {
-        if(!empty($content))
-        {
-        $ip = GetIP();
-        $dtime = time();
-          $ischeck = ($cfg_mb_msgischeck == 'Y')? 0 : 1;
-          if($cfg_soft_lang == 'gb2312')
-          {
-              $content = utf82gb(nl2br($content));
-          } 
-          $content = cn_substrR(HtmlReplace($content,1),360);
-          //对表情进行解析
-          $content = addslashes(preg_replace("/\[face:(\d{1,2})\]/is","<img src='".$cfg_memberurl."/templets/images/smiley/\\1.gif' style='cursor: pointer; position: relative;'>",$content));
-          $content = RemoveXSS($content);
-            $inquery = "INSERT INTO `#@__member_msg`(`mid`,`userid`,`ip`,`ischeck`,`dtime`, `msg`)
-                   VALUES ('{$cfg_ml->M_ID}','{$cfg_ml->M_LoginID}','$ip','$ischeck','$dtime', '$content'); ";
-            $rs = $dsql->ExecuteNoneQuery($inquery);
-            if(!$rs)
-            {
-                $output['type'] = 'error';
-                $output['data'] = '更新失败,请重试.';
-                exit();
-            }
-            $output['type'] = 'success';
-            if($cfg_soft_lang == 'gb2312')
-            {
-              $content = utf82gb(nl2br($content));
-            } 
-            $output['data'] = stripslashes($content);
-            exit(json_encode($output));
-        }
-    }
-}
 else
 {
     ShowMsg("本页面禁止返回!","index.php");

src/member/mystow.php

@@ -18,8 +18,8 @@ $tpl = '';
 $menutype = 'mydede';
 $rank = empty($rank) ? "" : $rank;
 if ($rank == 'top') {
-    $sql = "SELECT s.*,COUNT(s.aid) AS num,t.*  from #@__member_stow AS s LEFT JOIN `#@__member_stowtype` AS t on t.stowname=s.type group by s.aid order by num desc";
-    $tpl = 'stowtop';
+    $sql = "SELECT s.*,COUNT(s.aid) AS num,t.*  from `#@__member_stow` AS s LEFT JOIN `#@__member_stowtype` AS t on t.stowname=s.type group by s.aid order by num desc";
+    $tpl = 'mystowtop';
 } else {
     $sql = "SELECT s.*,t.* FROM `#@__member_stow` AS s left join `#@__member_stowtype` AS t on t.stowname=s.type  where s.mid='" . $cfg_ml->M_ID . "' order by s.id desc";
     $tpl = 'mystow';
@@ -32,6 +32,6 @@ while ($row = $dsql->GetArray('nn')) {
 
 $dlist = new DataListCP();
 $dlist->pageSize = 20;
-$dlist->SetTemplate(DEDEMEMBER . "/templets/$tpl.htm");
+$dlist->SetTemplate(DEDEMEMBER . "/templets/mystow.htm");
 $dlist->SetSource($sql);
 $dlist->Display();

src/member/pm.php

@@ -19,20 +19,13 @@ if($cfg_mb_lit=='Y')
     exit();
 }
 
-#api{{
-if(defined('UC_API') && @include_once DEDEROOT.'/uc_client/client.php')
-{
-    if($data = uc_get_user($cfg_ml->M_LoginID)) uc_pm_location($data[0]);
-}
-#/aip}}
-
 if(!isset($dopost))
 {
     $dopost = '';
 }
 //检查用户是否被禁言
 CheckNotAllow();
-$state=(empty($state))? "" : $state;
+$state=(empty($state))? 0 : intval($state);
 /*--------------------
 function __send(){  }
 ----------------------*/
@@ -200,10 +193,10 @@ else
                 $dsql->ExecuteNoneQuery($row3);
             }
         }
-        if($state=="1"){
+        if($state===1){
             $wsql= " toid='{$cfg_ml->M_ID}' AND folder='inbox' AND writetime!='' and hasview=1";
             $tname = "收件箱";
-        } else if ($state=="-1")
+        } else if ($state===-1)
         {
             $wsql = "toid='{$cfg_ml->M_ID}' AND folder='inbox' AND writetime!='' and hasview=0";
             $tname = "收件箱";
@@ -217,6 +210,7 @@ else
         $wsql = " `fromid` ='{$cfg_ml->M_ID}' AND folder LIKE 'outbox'";
         $tname = "已发信息";
     }
+
     $query = "SELECT * FROM `#@__member_pms` WHERE $wsql ORDER BY sendtime DESC";
     $dlist = new DataListCP();
     $dlist->pageSize = 20;

src/member/reg_new.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @version        $Id: reg_new.php 1 8:38 2010年7月9日Z tianya $
  * @package        DedeCMS.Member
@@ -6,177 +7,120 @@
  * @license        http://help.dedecms.com/usersguide/license.html
  * @link           http://www.dedecms.com
  */
-require_once(dirname(__FILE__)."/config.php");
-require_once DEDEINC.'/membermodel.cls.php';
-if($cfg_mb_allowreg=='N')
-{
+require_once(dirname(__FILE__) . "/config.php");
+require_once DEDEINC . '/membermodel.cls.php';
+if ($cfg_mb_allowreg == 'N') {
     ShowMsg('系统关闭了新用户注册！', 'index.php');
     exit();
 }
 
-if(!isset($dopost)) $dopost = '';
-$step = empty($step)? 1 : intval(preg_replace("/[^\d]/", '', $step));
+if (!isset($dopost)) $dopost = '';
+$step = empty($step) ? 1 : intval($step);
 
-if($step == 1)
-{
-    if($cfg_ml->IsLogin())
-    {
-        if($cfg_mb_reginfo == 'Y')
-        {
+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;
+            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');
+        ShowMsg('你已经登录系统，无需重新注册！', 'index.php');
         exit();
     }
-    if($dopost=='regbase')
-    {
+    if ($dopost == 'regbase') {
         $svali = GetCkVdValue();
-        if(preg_match("/1/", $safe_gdopen)){
-            if(strtolower($vdcode)!=$svali || $svali=='')
-            {
+        if (preg_match("/1/", $safe_gdopen)) {
+            if (strtolower($vdcode) != $svali || $svali == '') {
                 ResetVdValue();
                 ShowMsg('验证码错误！', '-1');
                 exit();
             }
         }
-        
-        $faqkey = isset($faqkey) && is_numeric($faqkey) ? $faqkey : 0;
-        if($safe_faq_reg == '1')
-        {
-            if($safefaqs[$faqkey]['answer'] != $rsafeanswer || $rsafeanswer=='')
-            {
-                ShowMsg('验证问题答案错误', '-1');
-                exit();
-            }
-        }
-        
-        $userid = trim($userid);
+
+        // $faqkey = isset($faqkey) && is_numeric($faqkey) ? $faqkey : 0;
+        // if($safe_faq_reg == '1')
+        // {
+        //     if($safefaqs[$faqkey]['answer'] != $rsafeanswer || $rsafeanswer=='')
+        //     {
+        //         ShowMsg('验证问题答案错误', '-1');
+        //         exit();
+        //     }
+        // }
+
+        $userid = $uname = trim($userid);
         $pwd = trim($userpwd);
         $pwdc = trim($userpwdok);
         $rs = CheckUserID($userid, '用户名');
-        if($rs != 'ok')
-        {
+        if ($rs != 'ok') {
             ShowMsg($rs, '-1');
             exit();
         }
-        if(strlen($userid) > 20 || strlen($uname) > 36)
-        {
+        if (strlen($userid) > 20 || strlen($uname) > 36) {
             ShowMsg('你的用户名或用户笔名过长，不允许注册！', '-1');
             exit();
         }
-        if(strlen($userid) < $cfg_mb_idmin || strlen($pwd) < $cfg_mb_pwdmin)
-        {
-            ShowMsg("你的用户名或密码过短，不允许注册！","-1");
+        if (strlen($userid) < $cfg_mb_idmin || strlen($pwd) < $cfg_mb_pwdmin) {
+            ShowMsg("你的用户名或密码过短，不允许注册！", "-1");
             exit();
         }
-        if($pwdc != $pwd)
-        {
+        if ($pwdc != $pwd) {
             ShowMsg('你两次输入的密码不一致！', '-1');
             exit();
         }
-        
+
         $uname = HtmlReplace($uname, 1);
-        //用户笔名重复检测
-        if($cfg_mb_wnameone=='N')
-        {
-            $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE uname LIKE '$uname' ");
-            if(is_array($row))
-            {
-                ShowMsg('用户笔名或公司名称不能重复！', '-1');
-                exit();
-            }
-        }
-        if(!CheckEmail($email))
-        {
-            ShowMsg('Email格式不正确！', '-1');
-            exit();
-        }
-        
-        #api{{
-        if(defined('UC_API') && @include_once DEDEROOT.'/uc_client/client.php')
-        {
-            $uid = uc_user_register($userid, $pwd, $email);
-            if($uid <= 0)
-            {
-                if($uid == -1)
-                {
-                    ShowMsg("用户名不合法！","-1");
-                    exit();
-                }
-                elseif($uid == -2)
-                {
-                    ShowMsg("包含要允许注册的词语！","-1");
-                    exit();
-                }
-                elseif($uid == -3)
-                {
-                    ShowMsg("你指定的用户名 {$userid} 已存在，请使用别的用户名！","-1");
-                    exit();
-                }
-                elseif($uid == -5)
-                {
-                    ShowMsg("你使用的Email 不允许注册！","-1");
-                    exit();
-                }
-                elseif($uid == -6)
-                {
-                    ShowMsg("你使用的Email已经被另一帐号注册，请使其它帐号","-1");
-                    exit();
-                }
-                else
-                {
-                    ShowMsg("注删失改！","-1");
-                    exit();
-                }
-            }
-            else
-            {
-                $ucsynlogin = uc_user_synlogin($uid);
-            }
-        }
-        #/aip}}
-        
-        if($cfg_md_mailtest=='Y')
-        {
-            $row = $dsql->GetOne("SELECT mid FROM `#@__member` WHERE email LIKE '$email' ");
-            if(is_array($row))
-            {
-                ShowMsg('你使用的Email已经被另一帐号注册，请使其它帐号！', '-1');
-                exit();
-            }
-        }
-    
+        // //用户笔名重复检测
+        // if($cfg_mb_wnameone=='N')
+        // {
+        //     $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE uname LIKE '$uname' ");
+        //     if(is_array($row))
+        //     {
+        //         ShowMsg('用户笔名或公司名称不能重复！', '-1');
+        //         exit();
+        //     }
+        // }
+        // if(!CheckEmail($email))
+        // {
+        //     ShowMsg('Email格式不正确！', '-1');
+        //     exit();
+        // }
+
+        // if($cfg_md_mailtest=='Y')
+        // {
+        //     $row = $dsql->GetOne("SELECT mid FROM `#@__member` WHERE email LIKE '$email' ");
+        //     if(is_array($row))
+        //     {
+        //         ShowMsg('你使用的Email已经被另一帐号注册，请使其它帐号！', '-1');
+        //         exit();
+        //     }
+        // }
+
         //检测用户名是否存在
         $row = $dsql->GetOne("SELECT mid FROM `#@__member` WHERE userid LIKE '$userid' ");
-        if(is_array($row))
-        {
+        if (is_array($row)) {
             ShowMsg("你指定的用户名 {$userid} 已存在，请使用别的用户名！", "-1");
             exit();
         }
-        if($safequestion==0)
-        {
-            $safeanswer = '';
-        }
-        else
-        {
-            if(strlen($safeanswer)>30)
-            {
-                ShowMsg('你的新安全问题的答案太长了，请控制在30字节以内！', '-1');
-                exit();
-            }
-        }
-    
+        // if($safequestion==0)
+        // {
+        //     $safeanswer = '';
+        // }
+        // else
+        // {
+        //     if(strlen($safeanswer)>30)
+        //     {
+        //         ShowMsg('你的新安全问题的答案太长了，请控制在30字节以内！', '-1');
+        //         exit();
+        //     }
+        // }
+
         //会员的默认金币
         $dfscores = 0;
         $dfmoney = 0;
         $dfrank = $dsql->GetOne("SELECT money,scores FROM `#@__arcrank` WHERE rank='10' ");
-        if(is_array($dfrank))
-        {
+        if (is_array($dfrank)) {
             $dfmoney = $dfrank['money'];
             $dfscores = $dfrank['scores'];
         }
@@ -185,178 +129,158 @@ if($step == 1)
         $joinip = GetIP();
         $loginip = GetIP();
         $pwd = md5($userpwd);
-		$mtype = RemoveXSS(HtmlReplace($mtype,1));
-		$safeanswer = HtmlReplace($safeanswer);
-		$safequestion = HtmlReplace($safequestion);
-        
+        $mtype = '个人';
+
         $spaceSta = ($cfg_mb_spacesta < 0 ? $cfg_mb_spacesta : 0);
-        
+
         $inQuery = "INSERT INTO `#@__member` (`mtype` ,`userid` ,`pwd` ,`uname` ,`sex` ,`rank` ,`money` ,`email` ,`scores` ,
         `matt`, `spacesta` ,`face`,`safequestion`,`safeanswer` ,`jointime` ,`joinip` ,`logintime` ,`loginip` )
-       VALUES ('$mtype','$userid','$pwd','$uname','$sex','10','$dfmoney','$email','$dfscores',
-       '0','$spaceSta','','$safequestion','$safeanswer','$jointime','$joinip','$logintime','$loginip'); ";
-        if($dsql->ExecuteNoneQuery($inQuery))
-        {
+       VALUES ('$mtype','$userid','$pwd','$uname','','10','$dfmoney','','$dfscores',
+       '0','$spaceSta','','','','$jointime','$joinip','$logintime','$loginip'); ";
+        if ($dsql->ExecuteNoneQuery($inQuery)) {
             $mid = $dsql->GetLastID();
-    
+
             //写入默认会员详细资料
-            if($mtype=='个人'){
-                $space='person';
-            }else if($mtype=='企业'){
-                $space='company';
-            }else{
-                $space='person';
+            if ($mtype == '个人') {
+                $space = 'person';
+            } else if ($mtype == '企业') {
+                $space = 'company';
+            } else {
+                $space = 'person';
             }
-    
+
             //写入默认统计数据
             $membertjquery = "INSERT INTO `#@__member_tj` (`mid`,`article`,`album`,`archives`,`homecount`,`pagecount`,`feedback`,`friend`,`stow`)
                    VALUES ('$mid','0','0','0','0','0','0','0','0'); ";
             $dsql->ExecuteNoneQuery($membertjquery);
-    
+
             //写入默认空间配置数据
             $spacequery = "INSERT INTO `#@__member_space`(`mid` ,`pagesize` ,`matt` ,`spacename` ,`spacelogo` ,`spacestyle`, `sign` ,`spacenews`)
                     VALUES('{$mid}','10','0','{$uname}的空间','','$space','',''); ";
             $dsql->ExecuteNoneQuery($spacequery);
-    
+
             //写入其它默认数据
             $dsql->ExecuteNoneQuery("INSERT INTO `#@__member_flink`(mid,title,url) VALUES('$mid','织梦内容管理系统','http://www.dedecms.com'); ");
-            
+
             $membermodel = new membermodel($mtype);
-            $modid=$membermodel->modid;
-            $modid = empty($modid)? 0 : intval(preg_replace("/[^\d]/",'', $modid));
-            $modelform = $dsql->getOne("SELECT * FROM #@__member_model WHERE id='$modid' ");
-            
-            if(!is_array($modelform))
-            {
+            $modid = $membermodel->modid;
+            $modid = empty($modid) ? 0 : intval($modid);
+            $modelform = $dsql->getOne("SELECT * FROM `#@__member_model` WHERE id='$modid' ");
+
+            if (!is_array($modelform)) {
                 showmsg('模型表单不存在', '-1');
                 exit();
-            }else{
+            } else {
                 $dsql->ExecuteNoneQuery("INSERT INTO `{$membermodel->table}` (`mid`) VALUES ('{$mid}');");
             }
-            
+
             //----------------------------------------------
             //模拟登录
             //---------------------------
-            $cfg_ml = new MemberLogin(7*3600);
+            $cfg_ml = new MemberLogin(7 * 3600);
             $rs = $cfg_ml->CheckUser($userid, $userpwd);
 
-            
-            //邮件验证
-            if($cfg_mb_spacesta==-10)
-            {
-                $userhash = md5($cfg_cookie_encode.'--'.$mid.'--'.$email);
-                $url = $cfg_basehost.(empty($cfg_cmspath) ? '/' : $cfg_cmspath)."/member/index_do.php?fmdo=checkMail&mid={$mid}&userhash={$userhash}&do=1";
-                $url = preg_replace("#http:\/\/#i", '', $url);
-                $url = 'http://'.preg_replace("#\/\/#", '/', $url);
-                $mailtitle = "{$cfg_webname}--会员邮件验证通知";
-                $mailbody = '';
-                $mailbody .= "尊敬的用户[{$uname}]，您好：\r\n";
-                $mailbody .= "欢迎注册成为[{$cfg_webname}]的会员。\r\n";
-                $mailbody .= "要通过注册，还必须进行最后一步操作，请点击或复制下面链接到地址栏访问这地址：\r\n\r\n";
-                $mailbody .= "{$url}\r\n\r\n";
-                $mailbody .= "Power by http://www.dedecms.com 织梦内容管理系统！\r\n";
-          
-                $headers = "From: ".$cfg_adminemail."\r\nReply-To: ".$cfg_adminemail;
-                if($cfg_sendmail_bysmtp == 'Y' && !empty($cfg_smtp_server))
-                {        
-                    $mailtype = 'TXT';
-                    require_once(DEDEINC.'/mail.class.php');
-                    $smtp = new smtp($cfg_smtp_server,$cfg_smtp_port,true,$cfg_smtp_usermail,$cfg_smtp_password);
-                    $smtp->debug = false;
-                    $smtp->sendmail($email,$cfg_webname,$cfg_smtp_usermail, $mailtitle, $mailbody, $mailtype);
-                }
-                else
-                {
-                    @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);
+
+            // //邮件验证
+            // if($cfg_mb_spacesta==-10)
+            // {
+            //     $userhash = md5($cfg_cookie_encode.'--'.$mid.'--'.$email);
+            //     $url = $cfg_basehost.(empty($cfg_cmspath) ? '/' : $cfg_cmspath)."/member/index_do.php?fmdo=checkMail&mid={$mid}&userhash={$userhash}&do=1";
+            //     $url = preg_replace("#http:\/\/#i", '', $url);
+            //     $url = 'http://'.preg_replace("#\/\/#", '/', $url);
+            //     $mailtitle = "{$cfg_webname}--会员邮件验证通知";
+            //     $mailbody = '';
+            //     $mailbody .= "尊敬的用户[{$uname}]，您好：\r\n";
+            //     $mailbody .= "欢迎注册成为[{$cfg_webname}]的会员。\r\n";
+            //     $mailbody .= "要通过注册，还必须进行最后一步操作，请点击或复制下面链接到地址栏访问这地址：\r\n\r\n";
+            //     $mailbody .= "{$url}\r\n\r\n";
+            //     $mailbody .= "Power by http://www.dedecms.com 织梦内容管理系统！\r\n";
+
+            //     $headers = "From: ".$cfg_adminemail."\r\nReply-To: ".$cfg_adminemail;
+            //     if($cfg_sendmail_bysmtp == 'Y' && !empty($cfg_smtp_server))
+            //     {        
+            //         $mailtype = 'TXT';
+            //         require_once(DEDEINC.'/mail.class.php');
+            //         $smtp = new smtp($cfg_smtp_server,$cfg_smtp_port,true,$cfg_smtp_usermail,$cfg_smtp_password);
+            //         $smtp->debug = false;
+            //         $smtp->sendmail($email,$cfg_webname,$cfg_smtp_usermail, $mailtitle, $mailbody, $mailtype);
+            //     }
+            //     else
+            //     {
+            //         @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");
+                require_once(DEDEMEMBER . "/templets/reg-new3.htm");
                 exit;
-            } 
+            }
         } else {
             ShowMsg("注册失败，请检查资料是否有误或与管理员联系！", "-1");
             exit();
         }
     }
-    require_once(DEDEMEMBER."/templets/reg-new.htm");
+    require_once(DEDEMEMBER . "/templets/reg-new.htm");
 } else {
-    if(!$cfg_ml->IsLogin())
-    {
+    if (!$cfg_ml->IsLogin()) {
         ShowMsg("尚未完成基本信息的注册,请返回重新填写！", "index_do.php?fmdo=user&dopost=regnew");
         exit;
     } else {
-        if($cfg_ml->fields['spacesta'] == 2)
-        {
-             ShowMsg('你已经登陆系统，无需重新注册！', 'index.php');
-             exit;
+        if ($cfg_ml->fields['spacesta'] == 2) {
+            ShowMsg('你已经登录系统，无需重新注册！', 'index.php');
+            exit;
         }
     }
     $membermodel = new membermodel($cfg_ml->M_MbType);
     $postform = $membermodel->getForm(true);
-    if($dopost == 'reginfo')
-    {
+    if ($dopost == 'reginfo') {
         //这里完成详细内容填写
         $dede_fields = empty($dede_fields) ? '' : trim($dede_fields);
         $dede_fieldshash = empty($dede_fieldshash) ? '' : trim($dede_fieldshash);
-        $modid = empty($modid)? 0 : intval(preg_replace("/[^\d]/",'', $modid));
-        
-        if(!empty($dede_fields))
-        {
-            if($dede_fieldshash != md5($dede_fields.$cfg_cookie_encode))
-            {
+        $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))
-        {
+        $modelform = $dsql->GetOne("SELECT * FROM `#@__member_model` WHERE id='$modid' ");
+        if (!is_array($modelform)) {
             showmsg('模型表单不存在', '-1');
             exit();
         }
         $inadd_f = '';
-        if(!empty($dede_fields))
-        {
+        if (!empty($dede_fields)) {
             $fieldarr = explode(';', $dede_fields);
-            if(is_array($fieldarr))
-            {
-                foreach($fieldarr as $field)
-                {
-                    if($field == '') continue;
+            if (is_array($fieldarr)) {
+                foreach ($fieldarr as $field) {
+                    if ($field == '') continue;
                     $fieldinfo = explode(',', $field);
-                    if($fieldinfo[1] == 'textdata')
-                    {
+                    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]);
                     }
-                    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 ($fieldinfo[0] == "birthday") ${$fieldinfo[0]} = GetDateMk(${$fieldinfo[0]});
+                    $inadd_f .= ',' . $fieldinfo[0] . " ='" . ${$fieldinfo[0]} . "' ";
                 }
             }
-
         }
-		
-  
+
         $query = "UPDATE `{$membermodel->table}` SET `mid`='{$cfg_ml->M_ID}' $inadd_f WHERE `mid`='{$cfg_ml->M_ID}'; ";
-        if($dsql->executenonequery($query))
-        {
+        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");
+            require_once(DEDEMEMBER . "/templets/reg-new3.htm");
             exit;
         }
     }
-    require_once(DEDEMEMBER."/templets/reg-new2.htm");
-}
+    require_once(DEDEMEMBER . "/templets/reg-new2.htm");
+}

src/member/templets/album_add.htm

@@ -1,129 +1,148 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
-<title>新建<?php echo $cInfos['typename']; ?> - 会员中心 - <?php echo $cfg_webname; ?></title>
-<link href="templets/style/base.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="../static/js/jquery.js"></script>
-<script type="text/javascript" src="templets/js/main.js"></script>
-<script type="text/javascript" src="templets/js/album.js"></script>
-<script type="text/javascript" src="templets/js/inputAutoClear.js"></script>
-<script type="text/javascript" src="templets/js/load.js"></script>
-<script type="text/javascript" src="templets/js/leftmenu.js"></script>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
+  <title>新建<?php echo $cInfos['typename']; ?> - 会员中心 - <?php echo $cfg_webname; ?></title>
+  <link href="templets/style/base.css" rel="stylesheet" type="text/css" />
+  <script type="text/javascript" src="../static/js/jquery.js"></script>
+  <script type="text/javascript" src="templets/js/main.js"></script>
+  <script type="text/javascript" src="templets/js/album.js"></script>
+  <script type="text/javascript" src="templets/js/inputAutoClear.js"></script>
+  <script type="text/javascript" src="templets/js/load.js"></script>
+  <script type="text/javascript" src="templets/js/leftmenu.js"></script>
 </head>
+
 <body>
-<div id="main">
-  <?php include(DEDEMEMBER."/templets/head.htm"); ?>
-  <div id="content" class="w960 clearfix">
-    <?php include(DEDEMEMBER."/templets/menu.php"); ?>
-    <div id="mcpmain">
-      <div id="appTab">
-        <ul>
-          <li class="thisTab"><a href="#"><span>新建<?php echo $cInfos['typename']; ?></span></a></li>
-        </ul>
-      </div>
-        <form name="form1" action="album_add.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit();">
+  <div id="main">
+    <?php include(DEDEMEMBER."/templets/head.htm"); ?>
+    <div id="content" class="w960 clearfix">
+      <?php include(DEDEMEMBER."/templets/menu.php"); ?>
+      <div id="mcpmain">
+        <div id="appTab">
+          <ul>
+            <li class="thisTab"><a href="#"><span>新建<?php echo $cInfos['typename']; ?></span></a></li>
+          </ul>
+        </div>
+        <form name="form1" action="album_add.php" method="post" enctype="multipart/form-data"
+          onsubmit="return checkSubmit();">
           <input type="hidden" name="dopost" value="save" />
           <input type="hidden" name="channelid" value="<?php echo $channelid; ?>" />
           <input type="hidden" name="imagebody" id="imagebody" value='' />
-      <div id="mainCp">
-        <h3 class="meTitle"><strong>新建<?php echo $cInfos['typename']; ?></strong></h3>
-        <div class="postForm">
-          <p class="cellBg">
-            <label><?php echo $cInfos['typename']; ?>标题：</label>
-            <input name="title" type="text" id="title" value="请输入内容主题" maxlength="100" class="intxt" onfocus="inputAutoClear(this)"/>
-          </p>
-          <p>
-            <label>标签TAG：</label>
-            <input name="tags" type="text" id="tags" maxlength="100" class="intxt"/>(用逗号分开)
-          </p>
-          <p class="cellBg">
-            <label>作者：</label>
-            <input type="text" name="writer" id="writer" value="<?php echo $cfg_ml->M_UserName?>" maxlength="100" class="intxt" style="width:219px"/>
-          </p>
-          <p>
-            <label>隶属栏目：</label>
-            <?php
+          <div id="mainCp">
+            <h3 class="meTitle"><strong>新建<?php echo $cInfos['typename']; ?></strong></h3>
+            <div class="postForm">
+              <p class="cellBg">
+                <label><?php echo $cInfos['typename']; ?>标题：</label>
+                <input name="title" type="text" id="title" value="请输入内容主题" maxlength="100" class="intxt"
+                  onfocus="inputAutoClear(this)" />
+              </p>
+              <p>
+                <label>标签TAG：</label>
+                <input name="tags" type="text" id="tags" maxlength="100" class="intxt" />(用逗号分开)
+              </p>
+              <p class="cellBg">
+                <label>作者：</label>
+                <input type="text" name="writer" id="writer" value="<?php echo $cfg_ml->M_UserName?>" maxlength="100"
+                  class="intxt" style="width:219px" />
+              </p>
+              <p>
+                <label>隶属栏目：</label>
+                <?php
     			$typeOptions = GetOptionList(0,$channelid);
     			echo "<select name='typeid' size='1'>\r\n";
     			echo "<option value='0' selected>请选择栏目...</option>\r\n";
     			echo $typeOptions;
     			echo "</select>";
 			?>
-            <span style="color:#F00">*</span>(不能选择带颜色的分类)
-          </p>
-          <p class="cellBg">
-            <label>我的分类：</label>
-            <?php
+                <span style="color:#F00">*</span>(不能选择带颜色的分类)
+              </p>
+              <p class="cellBg">
+                <label>我的分类：</label>
+                <?php
             	$classlist = classification($cfg_ml->M_ID, 0, $channelid);
             	echo "<select name='mtypesid' size='1'>\r\n";
             	echo "<option value='0' selected>请选择分类...</option>\r\n";
 				echo $classlist;
 				echo "</select>";
             ?>
-          <a href="mtypes.php">添加分类</a>
-          </p>
-          <p>
-            <label>图集简介：</label>
-            <textarea name="description" id="description"></textarea>(内容的简要说明)
-          </p>
-    </div>
-          <input name="maxwidth" type="hidden" id="maxwidth" value="<?php echo $cfg_album_width; ?>" />
-          <input name="prow" type="hidden"  value="<?php echo $cfg_album_row; ?>"  />
-          <input name="pcol" type="hidden"  value="<?php echo $cfg_album_col; ?>" />
-          <input name="ddmaxwidth" type="hidden" value="<?php echo $cfg_album_ddwidth; ?>" />
-        <!-- 表单操作区域 -->
-        <h3 class="meTitle">图集内容</h3>
-        <div class="contentShow postForm">
-          <p class="cellBg">
-            <label>表现方式：</label>
-            <input name="pagestyle" type="radio" id="pagestyle1" onclick="checkMuList()" value="1" <?php if($cfg_album_style==1) echo " checked='checked'"; ?> /> 多页多图显示(适用于QQ表情等)
-            <input name="pagestyle" type="radio" id="pagestyle2" onclick="checkMuList()" value="2" <?php if($cfg_album_style==2) echo " checked='checked'"; ?> />多页单图显示(幻灯)
-            <input name="pagestyle" type="radio" id="pagestyle3" onclick="checkMuList()" value="3" <?php if($cfg_album_style==3) echo " checked='checked'"; ?>/>多行多列显示(缩略图)
-          <div id='spagelist' style='display:none' class="mTB10"> 每页图片数：
-            <input name='pagpicnum' id='pagpicnum' size='10' class="text" value='<?php echo $cfg_album_pagesize; ?>'/>
-          </div>
-          </p>
-          <p>
-            <label>手工上传：</label>
-            图片数目：<input name="picnum" type="text" id="picnum" size="6" value="3" maxlength="100" class="intxt"/>
-                      <button class="buttonGary2" name='kkkup' type='button' id='kkkup2' onclick="MakeUpload(0);">增加</button>(最大60幅)
-          </p>
-          <p>
-            <div id="uploadfield"></div>
-            <script language="JavaScript">MakeUpload(2);</script>
-          </p>
-           <?php
+                <a href="mtypes.php">添加分类</a>
+              </p>
+              <p>
+                <label>图集简介：</label>
+                <textarea name="description" id="description"></textarea>(内容的简要说明)
+              </p>
+              <?php
+           //自定义字段
+           PrintAutoFieldsAdd($cInfos['fieldset'],'autofield');
+         ?>
+            </div>
+            <input name="maxwidth" type="hidden" id="maxwidth" value="<?php echo $cfg_album_width; ?>" />
+            <input name="prow" type="hidden" value="<?php echo $cfg_album_row; ?>" />
+            <input name="pcol" type="hidden" value="<?php echo $cfg_album_col; ?>" />
+            <input name="ddmaxwidth" type="hidden" value="<?php echo $cfg_album_ddwidth; ?>" />
+            <!-- 表单操作区域 -->
+            <h3 class="meTitle">图集内容</h3>
+            <div class="contentShow postForm">
+              <p class="cellBg">
+                <label>表现方式：</label>
+                <input name="pagestyle" type="radio" id="pagestyle1" onclick="checkMuList()" value="1"
+                  <?php if($cfg_album_style==1) echo " checked='checked'"; ?> /> 多页多图显示(适用于QQ表情等)
+                <input name="pagestyle" type="radio" id="pagestyle2" onclick="checkMuList()" value="2"
+                  <?php if($cfg_album_style==2) echo " checked='checked'"; ?> />多页单图显示(幻灯)
+                <input name="pagestyle" type="radio" id="pagestyle3" onclick="checkMuList()" value="3"
+                  <?php if($cfg_album_style==3) echo " checked='checked'"; ?> />多行多列显示(缩略图)
+              <div id='spagelist' style='display:none' class="mTB10"> 每页图片数：
+                <input name='pagpicnum' id='pagpicnum' size='10' class="text"
+                  value='<?php echo $cfg_album_pagesize; ?>' />
+              </div>
+              </p>
+              <p>
+                <label>手工上传：</label>
+                图片数目：<input name="picnum" type="text" id="picnum" size="6" value="3" maxlength="100" class="intxt" />
+                <button class="buttonGary2" name='kkkup' type='button' id='kkkup2'
+                  onclick="MakeUpload(0);">增加</button>(最大60幅)
+              </p>
+              <p>
+              <div id="uploadfield"></div>
+              <script language="JavaScript">MakeUpload(2);</script>
+              </p>
+              <?php
       if($safe_faq_send == '1'){
       	$faqkey = array_rand($safefaqs);
       ?>
-      	 <p class="cellBg">
-            <label>验证问题：</label>
-            <?php echo $safefaqs[$faqkey]['question'];?> (答案:<?php echo $safefaqs[$faqkey]['answer'];?>)<input class="intxt" name="safeanswer" type="text" id="safeanswer" size="25" style='width:250px;'/> 
-            <input type="hidden" name="faqkey" value="<?php echo $faqkey;?>" />
-         </p>
-      <?php
+              <p class="cellBg">
+                <label>验证问题：</label>
+                <?php echo $safefaqs[$faqkey]['question'];?> (答案:<?php echo $safefaqs[$faqkey]['answer'];?>)<input
+                  class="intxt" name="safeanswer" type="text" id="safeanswer" size="25" style='width:250px;' />
+                <input type="hidden" name="faqkey" value="<?php echo $faqkey;?>" />
+              </p>
+              <?php
    		 }
       	//游客强制加验证码，会员则判断后台开关
       	if(preg_match("/3/",$safe_gdopen)){
       ?>
-          <p  class="cellBg">
-            <label>验证码：</label>
-            <input name="vdcode" type="text" id="vdcode" maxlength="100" class="intxt" style='width:50px;text-transform:uppercase;' />
-            <img src="../plus/vdimgck.php" align="absmiddle" alt="看不清？点击更换" style="cursor:pointer" onclick="this.src=this.src+'?'" />
-          </p>
-      <?php }?>
-          <p>
-             <button  type="submit" class="button2">提交</button>
-             <button  type="reset" onclick="location.reload();" class="button2 ml10">重置</button>
-          </p>
-        </div>
+              <p class="cellBg">
+                <label>验证码：</label>
+                <input name="vdcode" type="text" id="vdcode" maxlength="100" class="intxt"
+                  style='width:50px;text-transform:uppercase;' />
+                <img src="../plus/vdimgck.php" align="absmiddle" alt="看不清？点击更换" style="cursor:pointer"
+                  onclick="this.src=this.src+'?'" />
+              </p>
+              <?php }?>
+              <p>
+                <button type="submit" class="button2">提交</button>
+                <button type="reset" onclick="location.reload();" class="button2 ml10">重置</button>
+              </p>
+            </div>
+          </div>
+        </form>
+        <!--主操作区域 -->
       </div>
-      </form>
-      <!--主操作区域 -->
     </div>
+    <?php include(DEDEMEMBER."/templets/foot.htm"); ?>
   </div>
-<?php include(DEDEMEMBER."/templets/foot.htm"); ?>
-</div>
 </body>
-</html>
+
+</html>

src/member/templets/album_edit.htm

@@ -1,28 +1,32 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
-<title>修改图集:<?php echo $row['title']?> - 会员中心 - <?php echo $cfg_webname; ?></title>
-<link href="templets/style/base.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="../static/js/jquery.js"></script>
-<script type="text/javascript" src="templets/js/main.js"></script>
-<script type="text/javascript" src="templets/js/album.js"></script>
-<script type="text/javascript" src="templets/js/load.js"></script>
-<script type="text/javascript" src="templets/js/leftmenu.js"></script>
-<script type="text/javascript" src="templets/js/checkSubmit.js"></script>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
+  <title>修改图集:<?php echo $row['title']?> - 会员中心 - <?php echo $cfg_webname; ?></title>
+  <link href="templets/style/base.css" rel="stylesheet" type="text/css" />
+  <script type="text/javascript" src="../static/js/jquery.js"></script>
+  <script type="text/javascript" src="templets/js/main.js"></script>
+  <script type="text/javascript" src="templets/js/album.js"></script>
+  <script type="text/javascript" src="templets/js/load.js"></script>
+  <script type="text/javascript" src="templets/js/leftmenu.js"></script>
+  <script type="text/javascript" src="templets/js/checkSubmit.js"></script>
 </head>
+
 <body>
-<div id="main">
-  <?php include(DEDEMEMBER."/templets/head.htm"); ?>
-  <div id="content" class="w960 clearfix">
-    <?php include(DEDEMEMBER."/templets/menu.php"); ?>
-    <div id="mcpmain">
-      <div id="appTab">
-        <ul>
-          <li class="thisTab"><a href="#"><span>修改图集</span></a></li>
-        </ul>
-      </div>
-   <form  name="addcontent" action="album_edit.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit();">
+  <div id="main">
+    <?php include(DEDEMEMBER."/templets/head.htm"); ?>
+    <div id="content" class="w960 clearfix">
+      <?php include(DEDEMEMBER."/templets/menu.php"); ?>
+      <div id="mcpmain">
+        <div id="appTab">
+          <ul>
+            <li class="thisTab"><a href="#"><span>修改图集</span></a></li>
+          </ul>
+        </div>
+        <form name="addcontent" action="album_edit.php" method="post" enctype="multipart/form-data"
+          onsubmit="return checkSubmit();">
           <input type="hidden" name="dopost" value="save" />
           <input type="hidden" name="aid" value="<?php echo $row['id']; ?>" />
           <input type="hidden" name="idhash" value="<?php echo hash('sha256', $row['id'].$cfg_cookie_encode); ?>" />
@@ -30,136 +34,155 @@
           <input type="hidden" name="oldlitpic" value="<?php echo $row['litpic']; ?>" />
           <input type="hidden" name="sortrank" value="<?php echo $row['sortrank']; ?>" />
           <input type="hidden" name="imagebody" id="imagebody" value='' />
-      <div id="mainCp">
-        <h3 class="meTitle"><strong>修改图集</strong></h3>
-        <div class="postForm">
-          <p class="cellBg">
-            <label>图集标题：</label>
-            	<input name="title" type="text" id="title" value="<?php echo $row['title']?>" maxlength="100" class="intxt"/>
-          </p>
-          <p>
-            <label>标签TAG：</label>
-           		<input name="tags" type="text" id="tags" value="<?php echo GetTags($row['id']); ?>" maxlength="100" class="intxt"/>(用逗号分开)
-          </p>
-          <p class="cellBg">
-            <label>作者：</label>
-            	<input type="text" name="writer" id="writer" value="<?php echo $cfg_ml->M_UserName?>"  maxlength="100" class="intxt" style="width:219px"/>
-          </p>
-          <p>
-            <label>隶属栏目：</label>
-   		<?php
+          <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>" />
+          <div id="mainCp">
+            <h3 class="meTitle"><strong>修改图集</strong></h3>
+            <div class="postForm">
+              <p class="cellBg">
+                <label>图集标题：</label>
+                <input name="title" type="text" id="title" value="<?php echo $row['title']?>" maxlength="100"
+                  class="intxt" />
+              </p>
+              <p>
+                <label>标签TAG：</label>
+                <input name="tags" type="text" id="tags" value="<?php echo GetTags($row['id']); ?>" maxlength="100"
+                  class="intxt" />(用逗号分开)
+              </p>
+              <p class="cellBg">
+                <label>作者：</label>
+                <input type="text" name="writer" id="writer" value="<?php echo $cfg_ml->M_UserName?>" maxlength="100"
+                  class="intxt" style="width:219px" />
+              </p>
+              <p>
+                <label>隶属栏目：</label>
+                <?php
    			$typeOptions = GetOptionList($row["typeid"],$row["channel"]);
     		echo "<select name='typeid' size='1'>\r\n";
     		echo $typeOptions;
     		echo "</select>";
 		?>
-            <span style="color:#F00">*</span>(不能选择带颜色的分类)
-          </p>
-          <p class="cellBg">
-            <label>我的分类：</label>
-            <?php
+                <span style="color:#F00">*</span>(不能选择带颜色的分类)
+              </p>
+              <p class="cellBg">
+                <label>我的分类：</label>
+                <?php
                 $typeOptions = classification($cfg_ml->M_ID, $row['mtype'], $channelid);
                 echo "<select name='mtypesid' size='1'>\r\n";
                 echo "<option value='0' selected>请选择分类...</option>\r\n";
                 echo $typeOptions;
                 echo "</select>";
     		?>
-          </p>
-          <p>
-            <label>图集简介：</label>
-            	<textarea name="description" id="description"><?php echo $row["description"]; ?></textarea>(内容的简要说明)
-          </p>
-        <?php
+              </p>
+              <p>
+                <label>图集简介：</label>
+                <textarea name="description" id="description"><?php echo $row["description"]; ?></textarea>(内容的简要说明)
+              </p>
+              <?php
            //自定义字段
             PrintAutoFieldsEdit($row['fieldset'],$addRow,'autofield');
          ?>
-    </div>
-          	<input name="maxwidth" type="hidden" id="maxwidth" value="<?php echo $abinfo->GetAtt('maxwidth'); ?>" />
-          	<input name="prow" type="hidden"  value="<?php echo $abinfo->GetAtt('row'); ?>"  />
-          	<input name="pcol" type="hidden"  value="<?php echo $abinfo->GetAtt('col'); ?>" />
-          	<input name="ddmaxwidth" type="hidden" value="<?php echo $abinfo->GetAtt('ddmaxwidth'); ?>" />
-        <h3 class="meTitle">图集内容</h3>
-        <div class="contentShow postForm">
-          <p class="cellBg">
-            <label>表现方式：</label>
-            	<input name="pagestyle" type="radio" id="pagestyle1" onclick="checkMuList()" value="1" <?php if($cfg_album_style==1) echo " checked='checked'"; ?> /> 多页多图显示(适用于QQ表情等)
-            	<input name="pagestyle" type="radio" id="pagestyle2" onclick="checkMuList()" value="2" <?php if($cfg_album_style==2) echo " checked='checked'"; ?> />多页单图显示(幻灯)
-            	<input name="pagestyle" type="radio" id="pagestyle3" onclick="checkMuList()" value="3" <?php if($cfg_album_style==3) echo " checked='checked'"; ?> />多行多列显示(缩略图)
-            <label> <div id="spagelist" style="<?php if($abinfo->GetAtt('value')!=2) echo "display:none"; ?>"> 每页图片数：</label> 
-                <input name="pagpicnum" id="pagpicnum" value="<?php echo $abinfo->GetAtt('pagpicnum'); ?>" maxlength="100" class="intxt" style="width:64px"/>
-                </div>
-          </p>
-          <p>
-            <label>手工上传：</label>
-            	<input name="picnum" type="text" id="picnum" size="8" value="3" maxlength="100" class="intxt"/>
-            	<button class="buttonGary2" name='kkkup' type='button' id='kkkup2' onclick="MakeUpload(0);">追加</button>
-                  (最大60幅)
-          </p>
-          <p>
+            </div>
+            <input name="maxwidth" type="hidden" id="maxwidth" value="<?php echo $abinfo->GetAtt('maxwidth'); ?>" />
+            <input name="prow" type="hidden" value="<?php echo $abinfo->GetAtt('row'); ?>" />
+            <input name="pcol" type="hidden" value="<?php echo $abinfo->GetAtt('col'); ?>" />
+            <input name="ddmaxwidth" type="hidden" value="<?php echo $abinfo->GetAtt('ddmaxwidth'); ?>" />
+            <h3 class="meTitle">图集内容</h3>
+            <div class="contentShow postForm">
+              <p class="cellBg">
+                <label>表现方式：</label>
+                <input name="pagestyle" type="radio" id="pagestyle1" onclick="checkMuList()" value="1"
+                  <?php if($cfg_album_style==1) echo " checked='checked'"; ?> /> 多页多图显示(适用于QQ表情等)
+                <input name="pagestyle" type="radio" id="pagestyle2" onclick="checkMuList()" value="2"
+                  <?php if($cfg_album_style==2) echo " checked='checked'"; ?> />多页单图显示(幻灯)
+                <input name="pagestyle" type="radio" id="pagestyle3" onclick="checkMuList()" value="3"
+                  <?php if($cfg_album_style==3) echo " checked='checked'"; ?> />多行多列显示(缩略图)
+                <label>
+                  <div id="spagelist" style="<?php if($abinfo->GetAtt('value')!=2) echo "display:none"; ?>"> 每页图片数：
+                </label>
+                <input name="pagpicnum" id="pagpicnum" value="<?php echo $abinfo->GetAtt('pagpicnum'); ?>"
+                  maxlength="100" class="intxt" style="width:64px" />
+            </div>
+            </p>
+            <p>
+              <label>手工上传：</label>
+              <input name="picnum" type="text" id="picnum" size="8" value="3" maxlength="100" class="intxt" />
+              <button class="buttonGary2" name='kkkup' type='button' id='kkkup2' onclick="MakeUpload(0);">追加</button>
+              (最大60幅)
+            </p>
+            <p>
             <div id="uploadfield"></div>
-       <?php
+            <?php
        		$j = 1;
        		if(is_array($dtp->CTags))
        		{
        			foreach($dtp->CTags as $ctag){
        				if($ctag->GetName()=="img"){
 	   ?>
-                  <table width='98%' align="center">
-                    <tr>
-                      <td height="18"><input type='checkbox' name='isokcheck<?php echo $j; ?>' id='isokcheck<?php echo $j; ?>' value='1' class='np' onclick='CheckSelTable(<?php echo $j; ?>)' checked='1' />
-                        显示/隐藏图片[<?php echo $j; ?>]的选框 </td>
-                    </tr>
-                  </table>
-                  <table width="98%" border="0" id="seltb<?php echo $j; ?>"  style="margin-bottom:6px;" align="center">
-                    <tr bgcolor="#F7F7F7">
-                      <td height="25" colspan="2">　<strong>图片</strong></td>
-                    </tr>
-                    <tr>
-                      <td width="310" height="25">　本地上传：
-                        <input type="text" name='imgfile<?php echo $j; ?>' style="width:200px;" maxlength="100" class="intxt"/>
-                      </td>
-                      <td width="322" rowspan="3" align="center"><div id='divpicview<?php echo $j; ?>' class='divpre' style="height:5px"></div>
-                      <img src="<?php echo trim($ctag->GetInnerText()); ?>" id="picview<?php echo $j; ?>" name="picview<?php echo $j; ?>" style="width: 128px; height: 128px;"/></td>
-                    </tr>
-                    <input type="hidden" name='imgurl<?php echo $j; ?>' value='<?php echo trim($ctag->GetInnerText())?>' />
-                    <tr>
-                      <td height="56">　图片简介：
-                      <textarea name='imgmsg<?php echo $j; ?>' style="height:46px;width:200px"><?php echo trim($ctag->GetAtt('text'))?></textarea></td>
-                    </tr>
-                  </table>
-		<?php
+            <table width='98%' align="center">
+              <tr>
+                <td height="18"><input type='checkbox' name='isokcheck<?php echo $j; ?>' id='isokcheck<?php echo $j; ?>'
+                    value='1' class='np' onclick='CheckSelTable(<?php echo $j; ?>)' checked='1' />
+                  显示/隐藏图片[<?php echo $j; ?>]的选框 </td>
+              </tr>
+            </table>
+            <table width="98%" border="0" id="seltb<?php echo $j; ?>" style="margin-bottom:6px;" align="center">
+              <tr bgcolor="#F7F7F7">
+                <td height="25" colspan="2">　<strong>图片</strong></td>
+              </tr>
+              <tr>
+                <td width="310" height="25">　本地上传：
+                  <input type="text" name='imgfile<?php echo $j; ?>' style="width:200px;" maxlength="100"
+                    class="intxt" />
+                </td>
+                <td width="322" rowspan="3" align="center">
+                  <div id='divpicview<?php echo $j; ?>' class='divpre' style="height:5px"></div>
+                  <img src="<?php echo trim($ctag->GetInnerText()); ?>" id="picview<?php echo $j; ?>"
+                    name="picview<?php echo $j; ?>" style="width: 128px; height: 128px;" />
+                </td>
+              </tr>
+              <input type="hidden" name='imgurl<?php echo $j; ?>' value='<?php echo trim($ctag->GetInnerText())?>' />
+              <tr>
+                <td height="56">　图片简介：
+                  <textarea name='imgmsg<?php echo $j; ?>'
+                    style="height:46px;width:200px"><?php echo trim($ctag->GetAtt('text'))?></textarea></td>
+              </tr>
+            </table>
+            <?php
 			$j++;
        				}
        			}
        		}
        		$dtp->Clear();
 		?>
-                  <span id='uploadfield'></span>
+            <span id='uploadfield'></span>
             <script language="JavaScript">
-startNum = <?php echo $j; ?>;
-</script>
-          </p>
-          <?php
+              startNum = <? php echo $j; ?>;
+            </script>
+            </p>
+            <?php
       	//游客强制加验证码，会员则判断后台开关
        if(preg_match("/3/",$safe_gdopen)){
       ?>
-          <p  class="cellBg">
-            <label>验证码：</label>
-            <input name="vdcode" type="text" id="vdcode" maxlength="100" class="intxt" style='width:50px;text-transform:uppercase;' />
-            <img src="../plus/vdimgck.php" alt="看不清？点击更换" align="absmiddle" style="cursor:pointer" onclick="this.src=this.src+'?'" />
-          </p>
-      <?php
+            <p class="cellBg">
+              <label>验证码：</label>
+              <input name="vdcode" type="text" id="vdcode" maxlength="100" class="intxt"
+                style='width:50px;text-transform:uppercase;' />
+              <img src="../plus/vdimgck.php" alt="看不清？点击更换" align="absmiddle" style="cursor:pointer"
+                onclick="this.src=this.src+'?'" />
+            </p>
+            <?php
       }
       ?>
-          <p>
-             <button  type="submit" class="button2">提交</button>
-             <button  type="reset" onclick="location.reload();" class="button2 ml10">重置</button>
-          </p>
-        </div>
-      </form>
+            <p>
+              <button type="submit" class="button2">提交</button>
+              <button type="reset" onclick="location.reload();" class="button2 ml10">重置</button>
+            </p>
+          </div>
+        </form>
+      </div>
     </div>
+    <?php include(DEDEMEMBER."/templets/foot.htm"); ?>
   </div>
-<?php include(DEDEMEMBER."/templets/foot.htm"); ?>
-</div>
 </body>
-</html>
+
+</html>

src/member/templets/content_list.htm

@@ -1,93 +1,106 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html lang="zh-CN">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
-<title>文档管理 - 会员中心 - <?php echo $cfg_webname; ?></title>
-<link href="templets/style/base.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="../static/js/jquery.js"></script>
-<script type="text/javascript" src="templets/js/load.js"></script>
-<script type="text/javascript" src="templets/js/leftmenu.js"></script>
-<script type="text/javascript">
-  function viewArc(aid){
-	  window.open("{dede:global.cfg_phpurl /}/view.php?aid="+aid);
-  }
-  function editArc(aid,channelid){
-	  location = "archives_do.php?dopost=edit&channelid="+channelid+"&aid="+aid;
-  }
-  function delArc(aid){
-	  if(window.confirm('你确定要删除这篇文档吗?')) location="archives_do.php?aid="+aid+"&dopost=delArc";
-  }
-</script>
+  <meta charset="<?php echo $cfg_soft_lang; ?>">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <script src="<?php echo $cfg_cmsurl;?>/static/js/jquery.min.js"></script>
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/bootstrap.min.css">
+  <link href="<?php echo $cfg_cmsurl;?>/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/dede.css">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/member.css">
+  <title>文档管理 - 会员中心 - <?php echo $cfg_webname; ?></title>
 </head>
+
 <body>
-<div id="main">
-  <?php include(DEDEMEMBER."/templets/head.htm"); ?>
-  <div id="content" class="w960 clearfix">
-    <?php include(DEDEMEMBER."/templets/menu.php"); ?>
-    <div id="mcpmain">
-      <div id="appTab">
-        <ul>
-          <li class="thisTab"><a href="#"><span><?php echo $positionname; ?></span></a></li>
-        </ul>
+  <?php include(DEDEMEMBER."/templets/top_login.htm"); ?>
+
+  <main class="member">
+    <?php include(DEDEMEMBER."/templets/info.htm"); ?>
+
+    <div class="container-fluid pannel">
+      <div class="container">
+        <div class="row">
+          <?php
+          $_menu_conex = true; // 展开编辑信息
+          ?>
+          <?php include(DEDEMEMBER."/templets/menu.htm"); ?>
+          <div class="pannel-main col-md-9 mt-3 mb-3">
+            <div class="pannel-main-container">
+              <ul class="nav mt-2">
+                <li class="nav-item">
+                  <a class="nav-link<?php echo ($arcrank=='')? ' active' : '';?>"
+                    href="content_list.php?channelid=<?php echo $channelid;?>">全部</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link<?php echo ($arcrank=='1')? ' active' : '';?>"
+                    href="content_list.php?channelid=<?php echo $channelid;?>&arcrank=1">已审核</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link<?php echo ($arcrank=='-1')? ' active' : '';?>"
+                    href="content_list.php?channelid=<?php echo $channelid;?>&arcrank=-1">未审核</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link<?php echo ($arcrank=='-2')? ' active' : '';?>"
+                    href="content_list.php?channelid=<?php echo $channelid;?>&arcrank=-2">被退回</a>
+                </li>
+              </ul>
+              <div class="table-responsive">
+                <table width="100%" border="0" cellpadding="0" cellspacing="0" class="table">
+                  <thead>
+                    <tr>
+                      <th>文章标题</th>
+                      <th>类目 </th>
+                      <th>状态 </th>
+                      <th>点击 </th>
+                      <th>发布时间 </th>
+                      <th>操作</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {dede:datalist}
+                    <tr>
+                      <td class="tabTitle"><a
+                          href='<?php echo $cfg_phpurl; ?>/view.php?aid=<?php echo $fields['id']; ?>'
+                          target='_blank'><?php echo $fields['title']; ?><?php echo IsPicArchives($fields['litpic']); ?></a>
+                      </td>
+                      <td align="center"><?php echo $fields['typename']; ?></td>
+                      <td align="center"><?php
+        if($fields['arcrank']>=0) echo "已审核";
+        else if($fields['arcrank']==-2) echo "<font color='blue'>被退回</font>";
+        else echo "<font color='red'>未审核</font>";
+        ?></td>
+                      <td align="center"><?php echo $fields['click']; ?></td>
+                      <td><?php echo GetDateMk($fields['senddate']); ?></td>
+                      <td align="center" class="doPost"><?php
+        if($fields['arcrank']<0 || $dtime - $fields['senddate'] < $maxtime)
+        {
+        ?>
+                        <a href="javascript:editArc(<?php echo $fields['id']?>,<?php echo $fields['channel']?>);">修改</a>
+                        | <a href="javascript:delArc(<?php echo $fields['id']?>);">删除</a> |
+                        <?php
+        }
+        else
+        {
+          echo "<span class='gray'>改 | 删 | </span>";
+        }
+        ?> <a href="javascript:viewArc(<?php echo $fields['id']; ?>);">预览</a></td>
+                    </tr>
+                    {/dede:datalist}
+                  </tbody>
+                </table>
+              </div>
+              <nav>
+                {dede:pagelist listsize=5 /}
+              </nav>
+
+            </div>
+          </div>
+        </div>
       </div>
-      <ul class="tabSub">
-        <li <?php echo ($arcrank=='')? "class='thisTab'" : "";?>><a href="content_list.php?channelid=<?php echo $channelid;?>"><span>全部</span></a></li>
-        <li <?php echo ($arcrank=='1')? "class='thisTab'" : "";?>><a href="content_list.php?channelid=<?php echo $channelid;?>&arcrank=1"><span>已审核</span></a></li>
-        <li <?php echo ($arcrank=='-1')? "class='thisTab'" : "";?>><a href="content_list.php?channelid=<?php echo $channelid;?>&arcrank=-1"><span>未审核</span></a></li>
-        <li <?php echo ($arcrank=='-2')? "class='thisTab'" : "";?>><a href="content_list.php?channelid=<?php echo $channelid;?>&arcrank=-2"><span>被退回</span></a></li>
-      </ul>
-      <div id="mainCp">
-        <!--内容消息提示 -->
-        <h3 class="meTitle">已发布<?php echo $positionname; ?><small>(曾经发布的所有<?php echo $positionname; ?>)</small></h3>
-        <table width="100%" border="0" cellpadding="0" cellspacing="0" class="list">
-          <thead>
-            <tr>
-              <th width="40%">文章标题</th>
-              <th width="15%">类目 </th>
-              <th width="10%">状态 </th>
-              <th width="10%">点击 </th>
-              <th width="11%">发布时间 </th>
-              <th width="25%">操作</th>
-            </tr>
-          </thead>
-          <tbody>
-          {dede:datalist}
-            <tr>
-              <td class="tabTitle"><a href='<?php echo $cfg_phpurl; ?>/view.php?aid=<?php echo $fields['id']; ?>' target='_blank'><?php echo $fields['title']; ?><?php echo IsPicArchives($fields['litpic']); ?></a></td>
-              <td align="center"><?php echo $fields['typename']; ?></td>
-              <td align="center"><?php
-if($fields['arcrank']>=0) echo "已审核";
-else if($fields['arcrank']==-2) echo "<font color='blue'>被退回</font>";
-else echo "<font color='red'>未审核</font>";
-?></td>
-              <td align="center"><?php echo $fields['click']; ?></td>
-              <td><?php echo GetDateMk($fields['senddate']); ?></td>
-              <td align="center" class="doPost"><?php
-if($fields['arcrank']<0 || $dtime - $fields['senddate'] < $maxtime)
-{
-?>
-                <a href="javascript:editArc(<?php echo $fields['id']?>,<?php echo $fields['channel']?>);">修改</a> | <a href="javascript:delArc(<?php echo $fields['id']?>);">删除</a> |
-                <?php
-}
-else
-{
-	echo "<span class='gray'>改 | 删 | </span>";
-}
-?>  <a href="javascript:viewArc(<?php echo $fields['id']; ?>);">预览</a></td>
-            </tr>
-         {/dede:datalist}
-          </tbody>
-          <tfoot>
-            <tr>
-              <td colspan="6"><div class="pageList">{dede:pagelist listsize=5/}</div></td>
-            </tr>
-          </tfoot>
-        </table>
-      </div>
-      <!--主操作区域 -->
     </div>
-  </div>
-<?php include(DEDEMEMBER."/templets/foot.htm"); ?>  
-</div>
+  </main>
+  <?php include(DEDEMEMBER."/templets/footer.htm"); ?>
 </body>
-</html>
+
+</html>

src/member/templets/edit_baseinfo.htm

@@ -1,151 +1,214 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html lang="zh-CN">
 
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
+  <meta charset="<?php echo $cfg_soft_lang; ?>">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <script src="<?php echo $cfg_cmsurl;?>/static/js/jquery.min.js"></script>
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/bootstrap.min.css">
+  <link href="<?php echo $cfg_cmsurl;?>/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/dede.css">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/member.css">
   <title>更改帐号基本资料 - 会员中心 - <?php echo $cfg_webname; ?></title>
-  <link href="templets/style/base.css" rel="stylesheet" type="text/css" />
-  <script type="text/javascript" src="../static/js/jquery.js"></script>
-  <script type="text/javascript" language='javascript' src='templets/js/main.js'></script>
-  <script type="text/javascript" src="templets/js/load.js"></script>
-  <script type="text/javascript" src="templets/js/leftmenu.js"></script>
-  <script type="text/javascript">
+</head>
+
+<body>
+  <?php include(DEDEMEMBER."/templets/top_login.htm"); ?>
+
+  <main class="member">
+    <?php include(DEDEMEMBER."/templets/info.htm"); ?>
+
+    <div class="container-fluid pannel">
+      <div class="container">
+        <div class="row">
+          <?php
+          $_menu_edtex = true; // 展开编辑信息
+          $_menu_edtitem = 'base'; // 当前标签页
+          ?>
+          <?php include(DEDEMEMBER."/templets/menu.htm"); ?>
+          <div class="pannel-main col-md-9 mt-3 mb-3">
+            <div class="pannel-main-container">
+              <ul class="nav nav-tabs">
+                <li class="nav-item">
+                  <a class="nav-link active" href="edit_baseinfo.php">账号安全</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link" href="edit_face.php">头像设置</a>
+                </li>
+              </ul>
+              <form action="edit_baseinfo.php" method="post" enctype="multipart/form-data" name="form2"
+                onsubmit="return checkSubmit();" class="mt-3">
+                <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>" />
+                <input type="hidden" name="dopost" value="save" />
+                <div class="form-group row">
+                  <label class="col-sm-2 col-form-label">帐号类型</label>
+                  <div class="col-sm-10">
+                    <?php echo $row['mtype']; ?>
+                  </div>
+                </div>
+                <div class="form-group row">
+                  <label class="col-sm-2 col-form-label">用户名</label>
+                  <div class="col-sm-10">
+                    <?php echo $cfg_ml->M_LoginID; ?>
+                  </div>
+                </div>
+                <div class="form-group row">
+                  <label for="iptUname" class="col-sm-2 col-form-label">昵称/公司名称</label>
+                  <div class="col-sm-10">
+                    <input name="uname" type="text" class="form-control" id="iptUname"
+                      value="<?php echo $row['uname']; ?>">
+                  </div>
+                  <small class="offset-md-2 col-sm-8 text-muted">
+                    个人会员该项为昵称，企业会员填写公司名称
+                  </small>
+                </div>
+
+                <div class="form-group row">
+                  <label for="iptOldpwd" class="col-sm-2 col-form-label">原登录密码</label>
+                  <div class="col-sm-10">
+                    <input name="oldpwd" type="password" class="form-control" id="iptOldpwd">
+                  </div>
+                </div>
+
+                <div class="form-group row">
+                  <label for="iptUserpwd" class="col-sm-2 col-form-label">新密码</label>
+                  <div class="col-sm-10">
+                    <input name="userpwd" type="password" class="form-control" id="iptUserpwd">
+                  </div>
+                  <small class="offset-md-2 col-sm-8 text-muted">
+                    不修改密码请保留此项为空
+                  </small>
+                </div>
+
+                <div class="form-group row">
+                  <label for="iptUserpwdok" class="col-sm-2 col-form-label">确认新密码</label>
+                  <div class="col-sm-10">
+                    <input name="userpwdok" type="password" class="form-control" id="iptUserpwdok">
+                  </div>
+                  <small class="offset-md-2 col-sm-8 text-muted">
+                    不修改密码请保留此项为空
+                  </small>
+                </div>
+
+                <div class="form-group row">
+                  <label class="col-sm-2 col-form-label">原安全问题</label>
+                  <div class="col-sm-10">
+                    <?php
+                        require(DEDEDATA.'/safequestions.php');
+                        echo GetSafequestion($row['safequestion'],'safequestion');
+                    ?>
+                  </div>
+                  <small class="offset-md-2 col-sm-8 text-muted">
+                    忘记密码时重设密码用
+                  </small>
+                </div>
+
+                <div class="form-group row">
+                  <label for="iptSafeanswer" class="col-sm-2 col-form-label">原问题答案</label>
+                  <div class="col-sm-10">
+                    <input name="safeanswer" type="text" class="form-control" id="iptSafeanswer">
+                  </div>
+                </div>
+
+                <div class="form-group row">
+                  <label class="col-sm-2 col-form-label">新安全问题</label>
+                  <div class="col-sm-10">
+                    <?php
+                      echo GetSafequestion(0,'newsafequestion');
+                    ?>
+                  </div>
+                  <small class="offset-md-2 col-sm-8 text-muted">
+                    不修改不用填写
+                  </small>
+                </div>
+
+                <div class="form-group row">
+                  <label for="iptNewsafeanswer" class="col-sm-2 col-form-label">新问题答案</label>
+                  <div class="col-sm-10">
+                    <input name="newsafeanswer" type="text" class="form-control" id="iptNewsafeanswer">
+                  </div>
+                </div>
+
+                <div class="form-group row">
+                  <label for="iptEmail" class="col-sm-2 col-form-label">电子邮箱</label>
+                  <div class="col-sm-10">
+                    <input name="email" type="email" class="form-control" id="iptEmail">
+                  </div>
+                  <small class="offset-md-2 col-sm-8 text-muted">
+                    每个电子邮邮箱只能注册一个帐号，要修改电子邮箱必须填写正确安全问题的答案
+                  </small>
+                </div>
+
+                <div class="form-group row">
+                  <label for="iptEmail" class="col-sm-2 col-form-label">性别</label>
+                  <div class="col-sm-10">
+                    <input type="radio" name="sex" value="男"
+                      <?php if($row['sex']=='男') echo " checked='checked' "; ?> />
+                    男 &nbsp;
+                    <input type="radio" name="sex" value="女"
+                      <?php if($row['sex']=='女') echo " checked='checked' "; ?> />
+                    女 &nbsp;
+                    <input type="radio" name="sex" value="保密'"
+                      <?php if($row['sex']=='保密') echo " checked='checked' "; ?> />
+                    保密
+                  </div>
+                </div>
+
+                <div class="form-group row">
+                  <label for="iptValidate" class="col-sm-2 col-form-label">验证码</label>
+                  <div class="col-sm-10">
+                    <div class="input-group">
+                      <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate"
+                        style="text-transform:uppercase;">
+                      <img src="<?php echo $cfg_cmsurl;?>/plus/vdimgck.php" id="validateimg" style="cursor:pointer;"
+                        onclick="this.src='<?php echo $cfg_cmsurl;?>/plus/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)"
+                        title="点击我更换图片" alt="点击我更换图片" />
+                    </div>
+                  </div>
+                </div>
+                <div class="form-group row">
+                  <div class="col-sm-10">
+                    <button type="submit" class="btn btn-success">保存</button>
+                  </div>
+                </div>
+              </form>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </main>
+  <?php include(DEDEMEMBER."/templets/footer.htm"); ?>
+  <script>
     function checkSubmit() {
       if (document.form2.oldpwd.value == '') {
         document.form2.oldpwd.focus();
-        alert("旧密码必须填写！");
+        ShowMsg("旧密码必须填写！");
         return false;
       }
       if (document.form2.userpwdok.value != document.form2.userpwd.value) {
         document.form2.userpwdok.focus();
-        alert("两次密码不一致！");
+        ShowMsg("两次密码不一致！");
         return false;
       }
       if (document.form2.email.value == "") {
         document.form2.email.focus();
-        alert("Email不能为空！");
+        ShowMsg("Email不能为空！");
         return false;
       }
       if (document.form2.uname.value == "") {
         document.form2.uname.focus();
-        alert("用户昵称不能为空！");
+        ShowMsg("用户昵称不能为空！");
         return false;
       }
       if (document.form2.vdcode.value == "") {
         document.form2.vdcode.focus();
-        alert("验证码不能为空！");
+        ShowMsg("验证码不能为空！");
         return false;
       }
     }
   </script>
-</head>
 
-<body>
-  <div id="main">
-    <?php include(DEDEMEMBER."/templets/head.htm"); ?>
-    <div id="content" class="w960 clearfix">
-      <?php include(DEDEMEMBER."/templets/menu.php"); ?>
-      <div id="mcpmain">
-        <div id="appTab">
-          <ul>
-            <li class="thisTab"><a href="edit_baseinfo.php">基本资料</a></li>
-            <li><a href="edit_fullinfo.php">详细资料</a></li>
-            <li><a href="edit_face.php">头像设置</a></li>
-          </ul>
-        </div>
-        <form action="edit_baseinfo.php" method="post" enctype="multipart/form-data" name="form2"
-          onsubmit="return checkSubmit();">
-          <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>" />
-          <input type="hidden" name="dopost" value="save" />
-          <div id="mainCp">
-            <h3 class="meTitle"><strong>基本资料</strong></h3>
-            <div class="postForm">
-              <p class="cellBg">
-                <label>帐号类型：</label>
-                <?php echo $row['mtype']; ?></p>
-              <p>
-                <label>用户名：</label>
-                <?php echo $cfg_ml->M_LoginID; ?>
-              </p>
-              <p class="cellBg">
-                <label style="width:90px">昵称/公司名称：</label>
-                <input name="uname" type="text" id="uname" value="<?php echo $row['uname']; ?>" class="intxt"
-                  style="width:100px" />
-                * <span id="_uname">(个人会员该项为昵称，企业会员填写公司名称)</span>
-              </p>
-              <p>
-                <label>原登陆密码：</label>
-                <input name="oldpwd" type="password" id="oldpwd" class="intxt" /> <span style="color:red;">*</span>
-              </p>
-              <p class="cellBg">
-                <label>新密码：</label>
-                <input name="userpwd" type="password" id="userpwd" class="intxt" />
-                <span id="_userpwdok">(不修改密码请保留此项为空)</span>
-              </p>
-              <p>
-                <label>确认新密码：</label>
-                <input name="userpwdok" type="password" id="userpwdok" value="" class="intxt" />
-                <span id="_userpwdok2">(不修改密码请保留此项为空)</span> </span>
-              </p>
-              <p class="cellBg">
-                <label>原安全问题：</label>
-                <?php
-      			require(DEDEDATA.'/safequestions.php');
-      			echo GetSafequestion($row['safequestion'],'safequestion');
-     		 ?>
-                <span id="_safequestion">(忘记密码时重设密码用)</span>
-              </p>
-              <p>
-                <label>原问题答案：</label>
-                <input name="safeanswer" type="text" id="safeanswer" value="" class="intxt" />
-              </p>
-
-              <p class="cellBg">
-                <label>新安全问题：</label>
-                <?php
-      			echo GetSafequestion(0,'newsafequestion');
-      		?>
-                <span id="_safequestionnew">(不修改不用填写)</span>
-              </p>
-              <p>
-                <label>新问题答案：</label>
-                <input name="newsafeanswer" type="text" id="newsafeanswer" class="intxt" />
-              </p>
-              <p class="cellBg">
-                <label><span class="tdl">电子邮箱</span>：</label>
-                <input name="email" type="text" id="email" value="<?php echo $row['email']; ?>" class="intxt" /><br>
-                <span id="_email" style="margin-left:80px"> <span style="color:red;">*</span>
-                  (每个电子邮邮箱只能注册一个帐号，要修改电子邮箱必须填写正确安全问题的答案)</span>
-              </p>
-              <p>
-                <label>性别：</label>
-                <input type="radio" name="sex" value="男" <?php if($row['sex']=='男') echo " checked='checked' "; ?> />
-                男 &nbsp;
-                <input type="radio" name="sex" value="女" <?php if($row['sex']=='女') echo " checked='checked' "; ?> />
-                女 &nbsp;
-                <input type="radio" name="sex" value="保密'" <?php if($row['sex']=='保密') echo " checked='checked' "; ?> />
-                保密
-              </p>
-              <p class="cellBg">
-                <label>验证码：</label>
-                <input name="vdcode" type="text" id="vdcode" style='width:50px;text-transform:uppercase;'
-                  class="intxt" />
-                <img src="../plus/vdimgck.php" align="absmiddle" alt="看不清？点击更换" style="cursor:pointer"
-                  onclick="this.src=this.src+'?'" />
-              </p>
-              <p>
-                <button class="button2" type="submit">更新</button>
-                <button class="button2 ml10" type="reset">重设</button>
-              </p>
-            </div>
-          </div>
-        </form>
-        <!--主操作区域 -->
-      </div>
-    </div>
-    <?php include(DEDEMEMBER."/templets/foot.htm"); ?>
-  </div>
 </body>
 
 </html>

src/member/templets/edit_face.htm

@@ -1,63 +1,76 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html lang="zh-CN">
 
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
-  <title>更改头像 - 会员中心 - <?php echo $cfg_webname; ?></title>
-  <link href="templets/style/base.css" rel="stylesheet" type="text/css" />
-  <script type="text/javascript" src="../static/js/jquery.js"></script>
-  <script type="text/javascript" language='javascript' src='templets/js/main.js'></script>
-  <script type="text/javascript" src="templets/js/load.js"></script>
-  <script type="text/javascript" src="templets/js/leftmenu.js"></script>
+  <meta charset="<?php echo $cfg_soft_lang; ?>">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <script src="<?php echo $cfg_cmsurl;?>/static/js/jquery.min.js"></script>
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/bootstrap.min.css">
+  <link href="<?php echo $cfg_cmsurl;?>/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/dede.css">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/member.css">
+  <title>头像设置 - 会员中心 - <?php echo $cfg_webname; ?></title>
 </head>
 
 <body>
-  <div id="main">
-    <?php include(DEDEMEMBER."/templets/head.htm"); ?>
-    <div id="content" class="w960 clearfix">
-      <?php include(DEDEMEMBER."/templets/menu.php"); ?>
-      <div id="mcpmain">
-        <div id="appTab">
-          <ul>
-            <li><a href="edit_baseinfo.php">基本资料</a></li>
-            <li><a href="edit_fullinfo.php">详细资料</a></li>
-            <li class="thisTab"><a href="edit_face.php">头像设置</a></li>
-          </ul>
-        </div>
-        <form action="edit_face.php" method="post" enctype="multipart/form-data" name="form1">
-          <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>" />
-          <input type="hidden" name="dopost" value="save" />
-          <div id="mainCp">
-            <h3 class="meTitle"><strong>用户头像</strong></h3>
-            <div class="postForm">
-              <p class="cellBg">
-                <label style="width:90px">手工填写网址：</label>
-                <input name='oldface' type='hidden' id='oldface' value='<?php echo $face; ?>' />
-                <input name='faceurl' type='text' id='faceurl' size='35' class='intxt' style='width:250px'
+  <?php include(DEDEMEMBER."/templets/top_login.htm"); ?>
+
+  <main class="member">
+    <?php include(DEDEMEMBER."/templets/info.htm"); ?>
+
+    <div class="container-fluid pannel">
+      <div class="container">
+        <div class="row">
+          <?php
+          $_menu_edtex = true; // 展开编辑信息
+          $_menu_edtitem = 'face'; // 当前标签页
+          ?>
+          <?php include(DEDEMEMBER."/templets/menu.htm"); ?>
+          <div class="pannel-main col-md-9 mt-3 mb-3">
+            <div class="pannel-main-container">
+              <ul class="nav nav-tabs">
+                <li class="nav-item">
+                  <a class="nav-link" href="edit_baseinfo.php">账号安全</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link active" href="edit_face.php">头像设置</a>
+                </li>
+              </ul>
+              <form action="edit_face.php" method="post" enctype="multipart/form-data" name="form1" class="mt-3">
+                <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>" />
+                <input type="hidden" name="dopost" value="save" />
+                <div class="form-group row">
+                  <label for="iptUname" class="col-sm-2 col-form-label">手工填写网址</label>
+                  <div class="col-sm-10">
+                    <input name='faceurl' type='text' id='faceurl' size='35' class='form-control'
                   value='<?php echo $face; ?>' />
-              <p class="cellBg">
-                <label style="width:90px"><b>原来的头像：</b><br />
-                  </label>
-              <div id='faceview' class='overflow mTB10 litPic'
-                style="width:180px;height:180px;text-align:center;vertical-align:middle;line-height:180px;display:table-cell;">
-                <?php
-       					if($face!='') echo " <img class='' src='$face' style='_margin-top:expression(( 180 - this.height ) / 2);' />\r\n";
-       			?>
-              </div>
-              </p>
-              <p>
-                <button class="button2" type="submit">更新</button>
-                <button class="button2 ml10" type="reset">重设</button>
-              </p>
+                  </div>
+                </div>
+
+                <div class="form-group row">
+                  <label for="iptValidate" class="col-sm-2 col-form-label">原来头像</label>
+                  <div class="col-sm-10">
+                    <?php
+                        if($face!='') echo " <img class='' src='$face' />\r\n";
+                    ?>
+                    
+                  </div>
+                </div>
+
+                <div class="form-group row">
+                  <div class="col-sm-10">
+                    <button type="submit" class="btn btn-success">保存</button>
+                  </div>
+                </div>
+              </form>
             </div>
           </div>
-        </form>
-        <!--主操作区域 -->
+        </div>
       </div>
     </div>
-    <?php include(DEDEMEMBER."/templets/foot.htm"); ?>
-  </div>
+  </main>
+  <?php include(DEDEMEMBER."/templets/footer.htm"); ?>
 </body>
 
-</html>
+</html>
+

src/member/templets/edit_fullinfo.htm

@@ -1,54 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
-  <title>更改详细资料 - 会员中心 -<?php echo $cfg_webname; ?></title>
-  <link href="templets/style/base.css" rel="stylesheet" type="text/css" />
-  <script type="text/javascript" src="../static/js/jquery.js"></script>
-  <script type="text/javascript" language='javascript' src='templets/js/main.js'></script>
-  <script type="text/javascript" src="templets/js/load.js"></script>
-  <script type="text/javascript" src="templets/js/calendar/calendar.js"></script>
-  <script type="text/javascript" src="templets/js/leftmenu.js"></script>
-</head>
-
-<body>
-  <div id="main">
-    <?php include(DEDEMEMBER."/templets/head.htm"); ?>
-    <div id="content" class="w960 clearfix">
-      <?php include(DEDEMEMBER."/templets/menu.php"); ?>
-      <div id="mcpmain">
-        <div id="appTab">
-          <ul>
-            <li><a href="edit_baseinfo.php">基本资料</a></li>
-            <li class="thisTab"><a href="edit_fullinfo.php">详细资料</a></li>
-            <li><a href="edit_face.php">头像设置</a></li>
-          </ul>
-        </div>
-        <form method="post" action="edit_fullinfo.php" name="form1">
-          <input type="hidden" value="save" name="dopost" />
-          <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>" />
-          <input type="hidden" value="<?php echo $membermodel->modid;?>" name="modid" />
-          <div id="mainCp">
-            <h3 class="meTitle"><strong>详细资料</strong></h3>
-            <div class="postForm"> 
-              <?php
-                  echo $postform;
-              ?>
-              <p>
-                <label>&nbsp;</label>
-                <button type="submit" id="btnSignCheck" class="buttonGreen142">完 成 </button>
-              </p>
-            </div>
-          </div>
-        </form>
-
-        <!--主操作区域 -->
-      </div>
-    </div>
-    <?php include(DEDEMEMBER."/templets/foot.htm"); ?>
-  </div>
-</body>
-
-</html>

src/member/templets/footer.htm

@@ -0,0 +1,45 @@
+<footer class="bg-success">
+    <div class="copyright py-5">
+        <p class="text-center">
+            Powered by <a href="http://www.dedecms.com" title="织梦内容管理系统(DedeCMS)--国内最专业的PHP网站管理系统，轻松建站的首选利器。" target="_blank"><strong>DedeCMS_<?php echo $cfg_version;?></strong></a> &copy; 2004-2020 <a href="http://www.desdev.cn/" target="_blank">DesDev</a> Inc. <a href="https://www.dedebiz.com" target="_blank" title="DedeBiz商业技术支持，提供更专业强大的站点应用开发技术">DedeBiz技术支持</a><br />
+            <?php echo $cfg_powerby;?>&nbsp;&nbsp;<?php echo $cfg_beian;?>
+        </p>
+    </div>
+</footer>
+<!-- /footer -->
+<div class="scroll-top">
+    <button onclick="gotop()" id="btnScrollTop" title="返回顶部">
+        <i class="fa fa-chevron-up" aria-hidden="true"></i>
+    </button>
+</div>
+<!-- /.scroll-top -->
+
+
+<script src="<?php echo $cfg_cmsurl;?>/static/js/popper.min.js"></script>
+<script src="<?php echo $cfg_cmsurl;?>/static/js/bootstrap.bundle.js"></script>
+<script src="<?php echo $cfg_cmsurl;?>/static/js/dede.js"></script>
+
+<script>
+    // 校验是否登录
+    function CheckLogin() {
+        $.get("<?php echo $cfg_cmsurl;?>/member/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>
+                `);
+                $("#iptUsername").val(result.data.username);
+                $("#iptUsername").attr("disabled", "disabled");
+                $(".areaValidate").hide();
+            } else {
+                $(".areaValidate").show();
+            }
+        });
+    }
+    // 页面加载触发
+    $(document).ready(function () {
+        CheckLogin();
+    });
+</script>

src/member/templets/head.htm

@@ -82,17 +82,14 @@ else {
     <ul id="appIterm">
       <li <?php echo ($menutype == 'content')? 'class="thisApp"' : "" ;?>><a href="../member/content_list.php?channelid=1">内容中心</a></li>
       <li <?php echo ($menutype == 'mydede')? 'class="thisApp"' : "" ;?>><a href="../member/" title="我的织梦">我的织梦</a></li>
-      <li <?php echo ($menutype == 'config')? 'class="thisApp"' : "" ;?>><a href="../member/edit_space_info.php" title="系统设置">系统设置</a></li>
+      <li <?php echo ($menutype == 'config')? 'class="thisApp"' : "" ;?>><a href="../member/edit_baseinfo.php" title="系统设置">系统设置</a></li>
     </ul>
     <!--程序导航列表 -->
     <div id="channel">
       <ul>
-        <li><a href="<?php echo $myurl; ?>" title="个人空间" target="_blank"><span>个人空间</span></a></li>
-        <li <?php echo ($menutype_son == 'mf')? 'class="thisApp"' : "" ;?>><a href="../member/myfriend.php" title="我的好友"><span>我的好友</span></a></li>
         <li <?php echo ($menutype_son == 'pm')? 'class="thisApp"' : "" ;?>><a href="../member/pm.php" title="短消息"><span>短消息</span></a></li>
         <li <?php echo ($menutype_son == 'gu')? 'class="thisApp"' : "" ;?>><a href="../member/guestbook_admin.php" title="留言板"><span>留言板</span></a></li>
         <li <?php echo ($menutype_son == 'op')? 'class="thisApp"' : "" ;?>><a href="../member/operation.php" title="消费中心"><span>消费中心</span></a></li>
-        <li <?php echo ($menutype_son == 'cc')? 'class="thisApp"' : "" ;?>><a href="../member/caicai.php" title="随便踩踩"><span>随便踩踩</span></a></li>
       </ul>
     </div>
     <!--导航栏目项 -->

src/member/templets/header.htm

@@ -0,0 +1,23 @@
+<div class="container header">
+    <header class="pt-3">
+        <div class="row">
+            <div class="col-12 col-sm-6 logo"><a href="<?php echo $cfg_cmsurl;?>/"><img src="<?php echo $cfg_cmsurl;?>/static/img/logo.gif"
+                        alt="<?php echo $cfg_webname;?>"></a></div>
+            <div class="col-12 col-sm-6 d-flex justify-content-end">
+                <div class="input-group py-3">
+                    <form class="search" name="formsearch" action="<?php echo $cfg_cmsurl;?>/plus/search.php">
+                        <input type="hidden" name="kwtype" value="0" />
+                        <input name="q" type="text" class="form-control" placeholder="输入搜索关键词">
+                        <div class="input-group-append">
+                            <button class="btn btn-success" type="submit">
+                                <i class="fa fa-search" aria-hidden="true"></i>
+                            </button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+
+        </div>
+    </header>
+</div>
+<!-- /.header -->

src/member/templets/index-notlogin.htm

@@ -1,112 +1,58 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
+<!doctype html>
+<html lang="zh-CN">
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
+  <meta charset="<?php echo $cfg_soft_lang; ?>">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <script src="<?php echo $cfg_cmsurl;?>/static/js/jquery.min.js"></script>
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/bootstrap.min.css">
+  <link href="<?php echo $cfg_cmsurl;?>/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/dede.css">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/member.css">
   <title><?php echo $cfg_webname; ?>- 会员登录</title>
+</head>
+<body>
 
-  <link href="templets/style/login.css" rel="stylesheet" type="text/css" />
-  <script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
-  <script type="text/javascript">
-    function changeAuthCode() {
-      var num = new Date().getTime();
-      var rand = Math.round(Math.random() * 10000);
-      num = num + rand;
-      $('#ver_code').css('visibility', 'visible');
-      if ($("#vdimgck")[0]) {
-        $("#vdimgck")[0].src = "../plus/vdimgck.php?tag=" + num;
-      }
-      return false;
-    }
+  <?php include(DEDEMEMBER."/templets/top.htm"); ?>
 
-  </script>
-</head>
+  <?php include(DEDEMEMBER."/templets/header.htm"); ?>
 
-<body>
-  <div class="header">
-    <div class="auto960">
-      <ul class="userMenu fRight">
-        <li> <a title="网站主页" href="../">网站主页</a> </li>
-        <li> <a title="注册" href="../member/index_do.php?fmdo=user&dopost=regnew">注册</a> </li>
-        <li> <a title="登录" href="../member/login.php">登录</a> </li>
-        <li class="help"> <a href="http://help.dedecms.com" title="DEDECMS 帮助中心" target="_blank">帮助</a> </li>
-      </ul>
-      <span>
-        <script type="text/javascript">
-          var now = (new Date()).getHours();
-          if (now > 0 && now <= 6) {
-            document.write("午夜好，");
-          } else if (now > 6 && now <= 11) {
-            document.write("早上好，");
-          } else if (now > 11 && now <= 14) {
-            document.write("中午好，");
-          } else if (now > 14 && now <= 18) {
-            document.write("下午好，");
-          } else {
-            document.write("晚上好，");
-          }
-        </script>
-        <i class="green">游客</i> 你可以选择到 </span>
+  <main class="login-from">
+    <div class="container">
+      <div class="login-area">
+        <h4 class="text-center py-2">欢迎登录</h4>
+        <form name='form1' method='POST' action='index_do.php'>
+          <input type="hidden" name="fmdo" value="login">
+          <input type="hidden" name="dopost" value="login">
+          <input type="hidden" name="keeptime" value="604800">
+          <input type="hidden" name="gourl" value="<?php if(!empty($gourl)) echo $gourl;?>">
+          <div class="input-group mb-3">
+            <input name="userid" type="text" class="form-control" placeholder="输入用户名">
+          </div>
+          <div class="form-group">
+            <div class="input-group">
+              <input placeholder="输入密码" name="pwd" type="password" class="form-control" id="iptPwd"
+                style="text-transform:uppercase;">
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="input-group">
+              <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate"
+                style="text-transform:uppercase;">
+              <img src="<?php echo $cfg_cmsurl;?>/plus/vdimgck.php" id="validateimg" style="cursor:pointer;"
+                onclick="this.src='<?php echo $cfg_cmsurl;?>/plus/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)"
+                title="点击我更换图片" alt="点击我更换图片" />
+            </div>
+          </div>
+          <button type="submit" class="btn btn-success btnLogin">登 录</button>
+          <a href="<?php echo $cfg_memberurl;?>/index_do.php?fmdo=user&dopost=regnew"
+            class="btn btn-outline-success btnLogin mt-2">注 册</a>
+        </form>
+      </div>
     </div>
-  </div>
-  <div class="wrapper">
-    <div class="logo fLeft"> <a href="/"> <img style="margin:8px 0 0 25px;" alt="会员中心"
-          src="../member/templets/images/login_logo.gif" /></a></div>
-    <div class="banner fRight"> <img src="../member/templets/images/530x56.gif" width="530" height="56" /></div>
-  </div>
-  <div class="login bor">
-    <div class="main fLeft">
-      <h3>请在这里登录<em><a href="index_do.php?fmdo=user&dopost=regnew">还没注册 点击这里</a></em></h3>
-      <form name='form1' method='POST' action='index_do.php'>
-        <input type="hidden" name="fmdo" value="login">
-        <input type="hidden" name="dopost" value="login">
-        <input type="hidden" name="gourl" value="<?php if(!empty($gourl)) echo $gourl;?>">
-        <ul>
-          <li> <span>用户名：</span>
-            <input id="txtUsername" class="text login_from" type="text" name="userid" />
-          </li>
-          <li> <span>密&nbsp;&nbsp;&nbsp;码：</span>
-            <input id="txtPassword" class="text login_from2" type="password" name="pwd" />
-          </li>
-          <li> <span>验证码：</span>
-            <input id="vdcode" class="text login_from3" type="text" style="width: 50px; text-transform: uppercase;"
-              name="vdcode" />
-            <img id="vdimgck" align="absmiddle" onclick="this.src=this.src+'?'" style="cursor: pointer;" alt="看不清？点击更换"
-              src="../plus/vdimgck.php" />
-            看不清？ <a href="#" onclick="changeAuthCode();">点击更换</a> </li>
-          <li> <span>有效期：</span>
-            <input type="radio" value="2592000" name="keeptime" id="ra1" />
-            <label for="ra1">一个月</label>
-            <input type="radio" checked="checked" value="604800" name="keeptime" id="ra2" />
-            <label for="ra2">一周</label>
-            <input type="radio" value="86400" name="keeptime" id="ra3" />
-            <label for="ra3">一天</label>
-            <input type="radio" value="0" name="keeptime" id="ra4" />
-            <label for="ra4">即时</label></li>
-          <li>
-            <button id="btnSignCheck" class="button2" type="submit">登&nbsp;录</button>
-            <a href="resetpassword.php">忘记密码？</a>
-          </li>
-        </ul>
-      </form>
-    </div>
-    <div class="login_sidebar fRight">
-      <p><span>还没有注册吗？</span><br />
-        本站的账号都没有？你也太落伍了<br />
-        赶紧去注册一个吧。</p>
-      <button class="signUp" onclick="javascript:location='index_do.php?fmdo=user&dopost=regnew'">注册</button>
-    </div>
-  </div>
-  <script language="javascript" type="text/javascript">
-    window.onload = function () {
-      setInterval("document.getElementById('time').innerHTML=new Date().toLocaleString()+' 星期'+'日一二三四五六'.charAt(new Date().getDay());", 1000);
-    }
-  </script>
-  <div class="footer bor">
-    <div class="fLeft mL10">Copyright &copy; 2004-2020 DedeCMS. 织梦科技 版权所有</div>
-    <div class="fRight mR10" id="time"> </div>
-  </div>
+
+  </main>
+
+  <?php include(DEDEMEMBER."/templets/footer.htm"); ?>
 </body>
 
 </html>

src/member/templets/index.htm

@@ -1,203 +1,124 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html lang="zh-CN">
+
 <head>
-<title>会员中心 -<?php echo $cfg_webname; ?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
-<link href="templets/style/index.css" rel="stylesheet" type="text/css" />
-<link href="templets/style/boxy.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="../static/js/jquery.js"></script>
-<script type="text/javascript" src="templets/js/jquery.boxy.js"></script>
-<script type="text/javascript" src="templets/js/load_index.js"></script>
-<script type="text/javascript" src="templets/js/leftmenu.js"></script>
-<script type="text/javascript" src="templets/js/face.js"></script>
-<script type="text/javascript" src="templets/js/Dialog.js"></script>
-<script type="text/javascript" src="templets/js/jquery.js"></script>
-<script type="text/javascript" src="templets/js/feed.js"></script>
-<script language='javascript'>
-	function msgSubmit(form) {
-		//var id=form.id.value;
-		var content = form.share_textarea.value;
-		if( content == '来,说点啥吧...' ) content = '';
-		if ( content == '' ) {
-			alert('请输入内容'); return false;
-		}
-		$.ajax({
-			type:'POST',
-			url:'index_do.php?fmdo=moodmsg&dopost=sendmsg',
-			cache:false,
-			data:'&content='+encodeURIComponent(content),
-			dataType:'json',
-			success:function(message){
-				if ( message.type == 'success' ) {
-					$('#share_textarea').val('');
-					$('#moodcontent').html(message.data);
-				} else {
-					alert(message.data);
-				}
-			}
-		});
-	}
-</script>
+  <meta charset="<?php echo $cfg_soft_lang; ?>">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <script src="<?php echo $cfg_cmsurl;?>/static/js/jquery.min.js"></script>
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/bootstrap.min.css">
+  <link href="<?php echo $cfg_cmsurl;?>/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/dede.css">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/member.css">
+  <title>会员中心 -<?php echo $cfg_webname; ?></title>
 </head>
+
 <body>
-<div id="baseParent">
-    <div id="mood_face_bg"></div>
-	<div id="mood_msg_menu" class="faceBox" style="position: absolute; top: 332px;display: none;">
-        <ul>
-        <?php
-        for($i=1;$i<=64;$i++)
-        {
-         ?>        
-            <li><img style="cursor: pointer; position: relative;" src="templets/images/smiley/<?php echo $i ?>.gif" id="face1" onclick="addFace(<?php echo $i ?>)"/></li>
-         <?php
-         }
-         ?>
-        </ul>
-	</div>
+  <?php include(DEDEMEMBER."/templets/top_login.htm"); ?>
+
+  <main class="member">
+    <?php include(DEDEMEMBER."/templets/info.htm"); ?>
 
-</div>
-<div id="main">
-<?php include(DEDEMEMBER."/templets/head.htm"); ?>
-<div id="content" class="w960 clearfix">
-  <?php include(DEDEMEMBER."/templets/menu.php"); ?>
-  <div class="755">
-    <div class="main-wrap">
-      <dl class="sns-avatar">
-        <dt>
-          <div class="s120"> <a href="<?php echo $cfg_cmsurl;?>/member/index.php?uid=<?php echo $cfg_ml->M_LoginID; ?>"><img src="<?php echo $cfg_ml->fields['face']; ?>" width="100" height="100" alt="您的形象"/></a> </div>
-        </dt>
-        <dd class="av-index">
-          <ul>
-            <li class="name"><?php echo $cfg_ml->M_LoginID; ?><span><?php echo $cfg_ml->M_MbType; ?>用户</span></li>
-            <?php
-             if(is_array($moodmsg)){
-            ?>
-            <li class="other" id="moodcontent"><?php echo $moodmsg['msg'];?></li>
-            <?php
-              } else {
-            ?>
-             <li class="other" id="moodcontent">还没有个性签名，试试在下面输入框中填写</li>
-             <?php
-             }
-             ?>
-            <li class="sign"><?php echo $cfg_ml->GetSta($dsql); ?></li>
-          </ul>
-          <div class="msg">
-            <p>短消息: <em> <a href="pm.php?TB_iframe=true&height=600&width=700" title="我的短信息" target="_blank"> <?php echo $pms['nums'];?></a> </em> 评论: <em> <a href="caicai.php" title="发出的评论"><?php echo $minfos['feedback']; ?></a> </em> 收藏: <em> <a href="mystow.php" title="收藏夹"><?php echo $minfos['stow']; ?></a> </em> 其它: <em><a href="javascript:;"><?php echo $minfos['archives']; ?></a> </em> 文章:<em> <a href="content_list.php?channelid=1" title="已发布的文章"><?php echo $minfos['article']; ?></a> </em>图集: <em> <a href="content_list.php?channelid=2" title="管理图集"><?php echo $minfos['album']; ?></a> </em> 软件: <em> <a href="content_list.php?channelid=3" title="已发布的软件"><?php echo $minfos['soft']; ?></a> </em> 商品:</a> <em> <a href="shops_products.php" title="购买的商品"><?php echo $minfos['shop']; ?></a> </em> </p>
+    <div class="container-fluid pannel">
+      <div class="container">
+        <div class="row">
+          <?php include(DEDEMEMBER."/templets/menu.htm"); ?>
+          <div class="pannel-main col-md-9 mt-3 mb-3">
+            <div class="pannel-main-container">
+              <ul class="nav nav-tabs">
+                <li class="nav-item">
+                  <a class="nav-link active" href="#">文章</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link" href="#">图集</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link" href="#">软件</a>
+                </li>
+              </ul>
+              <ul class="nav mt-2">
+                <li class="nav-item">
+                  <a class="nav-link active" href="#">全部</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link" href="#">已审核</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link" href="#">未审核</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link" href="#">被退回</a>
+                </li>
+              </ul>
+              <div class="table-responsive">
+                <table class="table">
+                  <thead>
+                    <tr>
+                      <th scope="col">文章标题</th>
+                      <th scope="col">类目</th>
+                      <th scope="col">状态</th>
+                      <th scope="col">点击</th>
+                      <th scope="col">发布时间</th>
+                      <th scope="col">操作</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <th scope="row">1</th>
+                      <td>Mark</td>
+                      <td>Otto</td>
+                      <td>@mdo</td>
+                      <td>@mdo</td>
+                      <td>@mdo</td>
+                    </tr>
+                    <tr>
+                      <th scope="row">2</th>
+                      <td>Jacob</td>
+                      <td>Thornton</td>
+                      <td>@fat</td>
+                      <td>@fat</td>
+                      <td>@fat</td>
+                    </tr>
+                    <tr>
+                      <th scope="row">3</th>
+                      <td>Larry</td>
+                      <td>the Bird</td>
+                      <td>@twitter</td>
+                      <td>@twitter</td>
+                      <td>@twitter</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <nav>
+                <ul class="pagination justify-content-center">
+                  <li class="page-item disabled">
+                    <span class="page-link">上一页</span>
+                  </li>
+                  <li class="page-item"><a class="page-link" href="#">1</a></li>
+                  <li class="page-item active">
+                    <span class="page-link">
+                      2
+                    </span>
+                  </li>
+                  <li class="page-item"><a class="page-link" href="#">3</a></li>
+                  <li class="page-item">
+                    <a class="page-link" href="#">下一页</a>
+                  </li>
+                  <li class="page-item">
+                    <a class="page-link" href="#">尾页</a>
+                  </li>
+                </ul>
+              </nav>
+            </div>
           </div>
-        </dd>
-      </dl>
-      <div class="share">
-        <div class="share01"> </div>
-        <div class="share02">
-          <form target="hidden_frame" method="post" enctype="multipart/form-data" name="msgmood" action="#">
-            <input id="share_textarea" type="text" value="来,说点啥吧..." onclick="showFace()"/>
-            <button id="btn_submit" type="button" onclick="msgSubmit(this.form)">发表</button>
-          </form>
         </div>
       </div>
-      <div id="sns-feeds">
-          <div class="indexTab">
-            <ul>
-              <li id="arcticle"><a href="javascript:void(0)">最新文档</a></li>
-              <li class="thisTab" id="myfeed"><a href="javascript:void(0)">我的动态</a></li>
-              <li id="allfeed"><a href="javascript:void(0)">全站动态</a></li>
-            </ul>
-          </div>
-        <div class="sns-box" id="FeedText"></div>
-      </div>
     </div>
-    <div class="col-extra">
-      <div class="sns-box">
-        <div class="hd">
-          <h3>信息统计</h3>
-        </div>
-        <div class="sns-avatar-m">
-          <dl class="statistics">
-            <dt>空间访问量：</dt>
-            <dd><?php echo $minfos['homecount']; ?></dd>
-            <dt>文档总点击：</dt>
-            <dd><?php echo $minfos['pagecount']; ?></dd>
-            <dt>好友数量：</dt>
-            <dd><?php echo $minfos['friend']; ?></dd>
-            <dt>空间版本：</dt>
-            <dd><?php
-       			if($cfg_mb_lit=='Y') echo '精简版';
-        		else echo '完全版';
-        	?></dd>
-            <dt>上传限制：</dt>
-            <dd><?php echo $cfg_mb_upload_size; ?> KB</dd>
-            <dt>空间大小：</dt>
-            <dd><?php echo $minfos['totaluse']."/".$cfg_mb_max; ?> MB</dd>
-          </dl>
-        </div>
-      </div>
-      <div class="sns-box">
-        <div class="hd">
-          <h3>欢迎新朋友</h3>
-        </div>
-        <div class="sns-avatar-m">
-          <ul>
-            <?php
-				foreach ($newfriends as $newfriend)
-				{
-			 ?>
-            <li class="pic"><a target="_blank" href="<?php echo $cfg_cmsurl;?>/member/index.php?uid=<?php echo $newfriend['userid'];?>">
-            <?php
-            if(!$newfriend['face']==""){
-             echo "<img src=".$newfriend['face']." width='48' height='48' />";
-            }else{
-             if($newfriend['sex']=='女') echo "<img src='templets/images/dfgirl.png' width='48' height='48' />";
-             else echo "<img src='templets/images/dfboy.png' width='48' height='48' />";
-            }
-            ?>
-            </a><span class="name"><a target="_blank" href="<?php echo $cfg_cmsurl;?>/member/index.php?uid=<?php echo $newfriend['userid'];?>"><?php echo $newfriend['uname'];?></a></span></li>
-             <?php
-                }
-              ?>
-          </ul>
-        </div>
-      </div>
-      <div class="clr"></div>
-      <div class="sns-box">
-        <div class="hd">
-          <h3>我的好友</h3>
-        </div>
-        <div class="sns-avatar-m">
-          <ul>
-             <?php
-				foreach ($friends as $friend)
-				{
-			 ?>
-            <li class="pic"><a target="_blank" href="<?php echo $cfg_cmsurl;?>/member/index.php?uid=<?php echo $friend['floginid'];?>">
-            <?php
-            if(!$friend['face']==""){
-             echo "<img src=".$friend['face']." width='48' height='48' />";
-            }else{
-             if($friend['sex']=='女') echo "<img src='templets/images/dfgirl.png' width='48' height='48' />";
-             else echo "<img src='templets/images/dfboy.png' width='48' height='48' />";
-            }
-            ?>
-            </a><span class="name"><a target="_blank" href="<?php echo $cfg_cmsurl;?>/member/index.php?uid=<?php echo $friend['floginid'];?>"><?php echo $friend['funame'];?></a></span></li>
-             <?php
-                }
-              ?>
-          </ul>
-        </div>
-      </div>
-      <div class="sns-box">
-        <div class="bd ">
-          <form action="search.php">
-            <p style="margin-bottom:9px">搜索用户</p>
-            <input class="text1" type="text" value="" name="keyword"/>
-            <button class="button1" type="submit">找人</button>
-          </form>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-<?php include(DEDEMEMBER."/templets/foot.htm"); ?>
-</div>
+  </main>
+
+
+  <?php include(DEDEMEMBER."/templets/footer.htm"); ?>
+
 </body>
+
 </html>

src/member/templets/info.htm

@@ -0,0 +1,24 @@
+<div class="container">
+    <div class="text-center member-info">
+        <img class="member-logo" src="<?php echo $cfg_ml->fields['face']; ?>" alt="<?php echo $cfg_ml->M_MbType; ?>的头像">
+        <div class="member-type"><span class="badge badge-success"><?php echo $cfg_ml->M_MbType; ?>用户</span></div>
+        <div>
+            <h4><?php echo $cfg_ml->M_LoginID; ?></h4>
+        </div>
+        <div class="member-rank text-danger">积分：<?php echo $cfg_ml->M_Scores;?>
+            金币：<?php echo $cfg_ml->M_Money;?> <a href="buy.php" class="btn btn-danger btn-sm">充值</a>
+        </div>
+        <div class="member-des text-secondary">本年度累计学习 0 分钟，已登录 12天 </div>
+        <ul class="nav justify-content-center">
+            <li class="nav-item">
+                <a class="nav-link" href="pm.php">短消息</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="mystow.php">收藏</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="shops_orders.php">订单</a>
+            </li>
+        </ul>
+    </div>
+</div>

src/member/templets/js/reg_new.js

@@ -26,7 +26,7 @@ $(document).ready(function()
 		if($('#txtPassword').val()=="")
 		{
 			$('#txtPassword').focus();
-			alert("登陆密码不能为空！");
+			alert("登录密码不能为空！");
 			return false;
 		}
 		if($('#userpwdok').val()!=$('#txtPassword').val())

src/member/templets/login.htm

@@ -1,112 +1,60 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
-<title><?php echo $cfg_webname; ?>- 会员登录</title>
-<link href="templets/style/login.css" rel="stylesheet" type="text/css" />
-<script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
-<script type="text/javascript">
-function changeAuthCode() {
-	var num = 	new Date().getTime();
-	var rand = Math.round(Math.random() * 10000);
-	num = num + rand;
-	$('#ver_code').css('visibility','visible');
-	if ($("#vdimgck")[0]) {
-		$("#vdimgck")[0].src = "../plus/vdimgck.php?tag=" + num;
-	}
-	return false;
-}
+<!doctype html>
+<html lang="zh-CN">
 
-</script>
-<style type="text/css">
-<!--
-.vermenu{
-	background:#FFFFFF none repeat scroll 0 0;
-	border:1px solid #EEEEEE;
-	position:absolute;
-	top: 208px;
-}
--->
-</style>
+<head>
+  <meta charset="<?php echo $cfg_soft_lang; ?>">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <script src="<?php echo $cfg_cmsurl;?>/static/js/jquery.min.js"></script>
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/bootstrap.min.css">
+  <link href="<?php echo $cfg_cmsurl;?>/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/dede.css">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/member.css">
+  <title><?php echo $cfg_webname; ?>- 会员登录</title>
 </head>
+
 <body>
-<div class="header">
-  <div class="auto960">
-    <ul class="userMenu fRight">
-      <li> <a title="网站主页" href="../">网站主页</a> </li>
-      <li> <a title="注册" href="../member/index_do.php?fmdo=user&dopost=regnew">注册</a> </li>
-      <li> <a title="登录" href="../member/login.php">登录</a> </li>
-      <li class="help"> <a href="http://help.dedecms.com" title="DEDECMS 帮助中心" target="_blank">帮助</a> </li>
-    </ul>
-    <span>
-    <script type="text/javascript">
- var now=(new Date()).getHours();
- if(now>0&&now<=6){
-document.write("午夜好，");
- }else if(now>6&&now<=11){
- document.write("早上好，");
- }else if(now>11&&now<=14){
- document.write("中午好，");
- }else if(now>14&&now<=18){
- document.write("下午好，");
- }else{
- document.write("晚上好，");
- }
-</script>
-    <i class="green">游客</i> 你可以选择到 </span> </div>
-</div>
-<div class="wrapper">
-  <div class="logo fLeft"> <a href="/"> <img  style="margin:8px 0 0 25px;"alt="会员中心" src="../member/templets/images/login_logo.gif"/></a></div>
-  <div class="banner fRight"> <img src="../member/templets/images/530x56.gif" width="530" height="56" /></div>
-</div>
-<div class="login bor">
-  <div class="main fLeft">
-    <h3>请在这里登录<em><a href="index_do.php?fmdo=user&dopost=regnew">还没注册 点击这里</a></em></h3>
-    <form name='form1' method='POST' action='index_do.php'>
-      <input type="hidden" name="fmdo" value="login">
-      <input type="hidden" name="dopost" value="login">
-      <input type="hidden" name="gourl" value="<?php if(!empty($gourl)) echo $gourl;?>">
-      <ul>
-        <li> <span>用户名：</span>
-          <input id="txtUsername" class="text login_from" type="text" name="userid"/>
-        </li>
-        <li> <span>密&nbsp;&nbsp;&nbsp;码：</span>
-          <input id="txtPassword" class="text login_from2" type="password" name="pwd"/>
-        </li>
-        <li> <span>验证码：</span>
-          <input id="vdcode" class="text login_from3" type="text" style="width: 50px; text-transform: uppercase;" name="vdcode"/>
-          <img id="vdimgck" align="absmiddle" onclick="this.src=this.src+'?'" style="cursor: pointer;" alt="看不清？点击更换" src="../plus/vdimgck.php"/>
-           看不清？ <a href="#" onclick="changeAuthCode();">点击更换</a> </li>
-        <li> <span>有效期：</span>
-          <input type="radio" value="2592000" name="keeptime" id="ra1"/>
-          <label for="ra1">一个月</label>
-          <input type="radio" checked="checked" value="604800" name="keeptime" id="ra2"/>
-          <label for="ra2">一周</label>
-          <input type="radio" value="86400" name="keeptime"  id="ra3"/>
-          <label for="ra3">一天</label>
-          <input type="radio" value="0" name="keeptime"  id="ra4"/>
-          <label for="ra4">即时</label></li>
-        <li>
-          <button id="btnSignCheck" class="button2" type="submit">登&nbsp;录</button>
-          <a href="resetpassword.php">忘记密码？</a> </li>
-      </ul>
-    </form>
-  </div>
-  <div class="login_sidebar fRight">
-    <p><span>还没有注册吗？</span><br />
-      本站的账号都没有？你也太落伍了<br />
-      赶紧去注册一个吧。</p>
-    <button class="signUp" onclick="javascript:location='index_do.php?fmdo=user&dopost=regnew'">注册</button>
-  </div>
-</div>
-<script language="javascript" type="text/javascript">
-	window.onload=function (){
-		setInterval("document.getElementById('time').innerHTML=new Date().toLocaleString()+' 星期'+'日一二三四五六'.charAt(new Date().getDay());",1000);
-	}
-</script>
-<div class="footer bor">
-  <div class="fLeft mL10">Copyright &copy; 2004-2020 DedeCMS 织梦科技 版权所有</div>
-  <div class="fRight mR10" id="time">  </div>
-</div>
+
+  <?php include(DEDEMEMBER."/templets/top.htm"); ?>
+
+  <?php include(DEDEMEMBER."/templets/header.htm"); ?>
+
+  <main class="login-from">
+    <div class="container">
+      <div class="login-area">
+        <h4 class="text-center py-2">欢迎登录</h4>
+        <form name='form1' method='POST' action='index_do.php'>
+          <input type="hidden" name="fmdo" value="login">
+          <input type="hidden" name="dopost" value="login">
+          <input type="hidden" name="keeptime" value="604800">
+          <input type="hidden" name="gourl" value="<?php if(!empty($gourl)) echo $gourl;?>">
+          <div class="input-group mb-3">
+            <input name="userid" type="text" class="form-control" placeholder="输入用户名">
+          </div>
+          <div class="form-group">
+            <div class="input-group">
+              <input placeholder="输入密码" name="pwd" type="password" class="form-control" id="iptPwd"
+                style="text-transform:uppercase;">
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="input-group">
+              <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate"
+                style="text-transform:uppercase;">
+              <img src="<?php echo $cfg_cmsurl;?>/plus/vdimgck.php" id="validateimg" style="cursor:pointer;"
+                onclick="this.src='<?php echo $cfg_cmsurl;?>/plus/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)"
+                title="点击我更换图片" alt="点击我更换图片" />
+            </div>
+          </div>
+          <button type="submit" class="btn btn-success btnLogin">登 录</button>
+          <a href="<?php echo $cfg_memberurl;?>/index_do.php?fmdo=user&dopost=regnew"
+            class="btn btn-outline-success btnLogin mt-2">注 册</a>
+        </form>
+      </div>
+    </div>
+
+  </main>
+
+  <?php include(DEDEMEMBER."/templets/footer.htm"); ?>
 </body>
-</html>
+
+</html>

src/member/templets/menu.htm

@@ -0,0 +1,75 @@
+<div class="member-menu col-md-3">
+    <ul class="list-group list-group-flush mt-3 mb-3">
+        <li class="list-group-item justify-content-between align-items-center">
+            <div data-toggle="collapse" data-target="#collapseArchives">我的内容 <span class="dropdown"></span>
+            </div>
+            <div id="collapseArchives" class="collapse mt-3<?php echo (isset($_menu_conex) && $_menu_conex===true)? ' show' : '';?>">
+                <ul class="list-group list-group-flush">
+                    <li class="list-group-item justify-content-between align-items-center active">
+                        <a href="javascript:;">文章</a>
+                    </li>
+                    <li class="list-group-item justify-content-between align-items-center">
+                        <a href="javascript:;">图集</a>
+                    </li>
+                    <li class="list-group-item justify-content-between align-items-center">
+                        <a href="javascript:;">软件</a>
+                    </li>
+                </ul>
+            </div>
+        </li>
+        <li class="list-group-item justify-content-between align-items-center">
+            <div data-toggle="collapse" data-target="#collapseMessage">消息管理 <span
+                    class="badge badge-warning badge-pill"><?php echo $pms['nums'];?></span><span class="dropdown"></span>
+            </div>
+            <div id="collapseMessage" class="mt-3 collapse<?php echo (isset($_menu_pmex) && $_menu_pmex===true)? ' show' : '';?>">
+                <ul class="list-group list-group-flush">
+                    <li class="list-group-item justify-content-between align-items-center<?php if(isset($_menu_pmstate) && $_menu_pmstate === 0) echo ' active';?>">
+                        <a href="pm.php?folder=inbox">全部</a>
+                    </li>
+                    <li class="list-group-item justify-content-between align-items-center<?php if(isset($_menu_pmstate) && $_menu_pmstate === 1) echo ' active';?>">
+                        <a href="pm.php?folder=inbox&state=1">已读</a>
+                    </li>
+                    <li class="list-group-item justify-content-between align-items-center<?php if(isset($_menu_pmstate) && $_menu_pmstate === -1) echo ' active';?>">
+                        <a href="pm.php?folder=inbox&state=-1">未读</a>
+                    </li>
+                </ul>
+            </div>
+        </li>
+        <li class="list-group-item justify-content-between align-items-center<?php echo (isset($_menu_stow) && $_menu_stow===true)? ' active' : '';?>">
+            <a href="mystow.php">我的搜藏</a>
+        </li>
+        <li class="list-group-item justify-content-between align-items-center">
+            <a href="javascript:;">钱包积分</a>
+        </li>
+        <li class="list-group-item justify-content-between align-items-center">
+            <div data-toggle="collapse" data-target="#collapseOrder">订单详情<span class="dropdown"></span></div>
+            <div id="collapseOrder" class="collapse mt-3">
+                <ul class="list-group list-group-flush">
+                    <li class="list-group-item justify-content-between align-items-center">
+                        <a href="javascript:;">购买内容</a>
+                    </li>
+                    <li class="list-group-item justify-content-between align-items-center">
+                        <a href="javascript:;">购买商品</a>
+                    </li>
+                    <li class="list-group-item justify-content-between align-items-center">
+                        <a href="javascript:;">金币订单</a>
+                    </li>
+                </ul>
+            </div>
+        </li>
+        <li class="list-group-item justify-content-between align-items-center">
+            <div data-toggle="collapse" data-target="#collapseMe">个人中心<span class="dropdown"></span>
+            </div>
+            <div id="collapseMe" class="collapse mt-3<?php echo (isset($_menu_edtex) && $_menu_edtex===true)? ' show' : '';?>">
+                <ul class="list-group list-group-flush">
+                    <li class="list-group-item justify-content-between align-items-center<?php if(isset($_menu_edtitem) && $_menu_edtitem === 'base') echo ' active';?>">
+                        <a href="edit_baseinfo.php">账号安全</a>
+                    </li>
+                    <li class="list-group-item justify-content-between align-items-center<?php if(isset($_menu_edtitem) && $_menu_edtitem === 'face') echo ' active';?>">
+                        <a href="edit_face.php">头像设置</a>
+                    </li>
+                </ul>
+            </div>
+        </li>
+    </ul>
+</div> <!-- /.member-menu -->

src/member/templets/mystow.htm

@@ -1,68 +1,79 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html lang="zh-CN">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
-<title>收藏夹 - 会员中心 - <?php echo $cfg_webname; ?></title>
-<link href="templets/style/base.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="../static/js/jquery.js"></script>
-<script type="text/javascript" src="templets/js/load.js"></script>
-<script type="text/javascript" src="templets/js/leftmenu.js"></script>
+  <meta charset="<?php echo $cfg_soft_lang; ?>">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <script src="<?php echo $cfg_cmsurl;?>/static/js/jquery.min.js"></script>
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/bootstrap.min.css">
+  <link href="<?php echo $cfg_cmsurl;?>/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/dede.css">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/member.css">
+  <title>收藏夹 - 会员中心 - <?php echo $cfg_webname; ?></title>
 </head>
+
 <body>
-<div id="main">
-  <?php include(DEDEMEMBER."/templets/head.htm"); ?>
-  <div id="content" class="w960 clearfix">
-    <?php include(DEDEMEMBER."/templets/menu.php"); ?>
-    <div id="mcpmain">
-      <div id="appTab">
-        <ul>
-          <li class="thisTab"><a href="mystow.php">我的收藏</a></li>
-          <li><a href="mystow.php?rank=top">收藏排行</a></li>
-        </ul>
-        <div class="tabOther"> </div>
+  <?php include(DEDEMEMBER."/templets/top_login.htm"); ?>
+
+  <main class="member">
+    <?php include(DEDEMEMBER."/templets/info.htm"); ?>
+
+    <div class="container-fluid pannel">
+      <div class="container">
+        <div class="row">
+          <?php
+          $_menu_stow = true; // 展开短消息菜单
+          ?>
+          <?php include(DEDEMEMBER."/templets/menu.htm"); ?>
+          <div class="pannel-main col-md-9 mt-3 mb-3">
+            <div class="pannel-main-container">
+              <ul class="nav nav-tabs">
+                <li class="nav-item">
+                  <a class="nav-link<?php echo $rank===''? ' active' : '';?>" href="mystow.php">我的收藏</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link<?php echo $rank==='top'? ' active' : '';?>" href="mystow.php?rank=top">收藏排行</a>
+                </li>
+              </ul>
+              <div class="table-responsive">
+                <table width="100%" border="0" cellpadding="0" cellspacing="0" class="table table-borderless">
+                  <tbody>
+                    {dede:datalist}
+                    <tr>
+                      <td colspan="5" class="tabTitle"><?php if($fields["stowname"]!='sys') {?>
+                        <a href='{dede:field.indexurl/}={dede:field.aid/}' target='_blank'>{dede:field.title/}</a>
+                        <?php }else{ ?>
+                        <a href='archives_do.php?dopost=viewArchives&aid={dede:field.aid/}'
+                          target='_blank'>{dede:field.title/}</a>
+                        <?php }?></td>
+                      <td width="25%" align="center" class="doPost"><span class="itemDigg">
+                          <a class="text_button"
+                            href="../plus/recommend.php?type={dede:field.type/}&aid={dede:field.aid/}"
+                            target="_blank">[推荐]</a>
+                        </span> <span class="itemManage">
+                          <a
+                            href='archives_do.php?dopost=delStow&type={dede:field.type/}&aid={dede:field.aid/}'>[删除]</a>
+                        </span></td>
+                    </tr>
+                    <tr style="border-bottom: solid 1px #DDD;">
+                      <td colspan="6" class="tabTitle tbBtm">收藏时间:<?php echo MyDate('Y-m-d H:i', $fields['addtime']); ?>
+                      </td>
+                    </tr>
+                    {/dede:datalist}
+                  </tbody>
+                </table>
+              </div>
+              <nav>
+                {dede:pagelist listsize=5 /}
+              </nav>
+            </div>
+          </div>
+        </div>
       </div>
-       <ul class="tabSub">
-       <?php
-         foreach($rows as $row)
-         {
-        ?>
-        <li <?php if($type==$row['stowname']) echo 'class="thisTab"';?> ><a href="mystow.php?type=<?php echo $row['stowname'];?>"><span><?php echo $row['indexname'];?></span></a></li>
-        <?php }?>
-      </ul>
-      <div id="mainCp">
-        <table width="100%" border="0" cellpadding="0" cellspacing="0" class="listStyle2">
-          <thead>
-          </thead>
-          <tbody>
-          {dede:datalist}
-          <tr>
-            <td colspan="5" class="tabTitle"><?php if($fields["stowname"]!='sys') {?>
-              <a href='{dede:field.indexurl/}={dede:field.aid/}' target='_blank'>{dede:field.title/}</a>
-              <?php }else{ ?>
-              <a href='archives_do.php?dopost=viewArchives&aid={dede:field.aid/}' target='_blank'>{dede:field.title/}</a>
-              <?php }?></td>
-            <td width="25%" align="center" class="doPost"><span class="itemDigg"> 
-            <a class="text_button" href="../plus/recommend.php?type={dede:field.type/}&aid={dede:field.aid/}" target="_blank">[推荐]</a> 
-            </span> <span class="itemManage">
-             <a href='archives_do.php?dopost=delStow&type={dede:field.type/}&aid={dede:field.aid/}'>[删除]</a> 
-             </span></td>
-          </tr>
-          <tr>
-            <td colspan="6" class="tabTitle tbBtm">收藏时间:<?php echo MyDate('m-d H:i', $fields['addtime']); ?></td>
-          </tr>
-          {/dede:datalist}
-          </tbody>
-          <tfoot>
-            <tr>
-              <td colspan="6"><div class="pageList"> {dede:pagelist listsize=5 /}</div></td>
-            </tr>
-          </tfoot>
-        </table>
-      </div>
-      <!--主操作区域 -->
     </div>
-  </div>
-<?php include(DEDEMEMBER."/templets/foot.htm"); ?>
-</div>
+  </main>
+
+  <?php include(DEDEMEMBER."/templets/footer.htm"); ?>
 </body>
+
 </html>

src/member/templets/pm-main.htm

@@ -1,128 +1,133 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html lang="zh-CN">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
-<title>消息管理 - 会员中心 - <?php echo $cfg_webname; ?></title>
-<link href="templets/style/base.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="../static/js/jquery.js"></script>
-<script type="text/javascript" src="templets/js/load.js"></script>
-<script type="text/javascript" src="templets/js/table_function.js"></script>
-<script type="text/javascript" src="templets/js/leftmenu.js"></script>
-<script type="text/javascript">
-//获得选中文件的文件名
-function GetCheckfolderItem()
-{
-	var allSel='';
-	if(document.form1.deleteid.value) return document.form1.deleteid.value;
-	for(i=0;i<document.form1.deleteid.length;i++)
-	{
-		if(document.form1.deleteid[i].checked)
-		{
-			if(allSel=='')
-			allSel=document.form1.deleteid[i].value;
-			else
-			allSel=allSel+","+document.form1.deleteid[i].value;
-		}
-	}
-	return allSel;
-}
-	
-	function DoSubmit(myfolder)
-	{
-		var selid = GetCheckfolderItem();
-		if(selid=='') {
-			alert("你没选中任何信息！");
-			return false;
-		}
-		if(window.confirm("你确定要删除这些消息么？"))
-		{
-			location = "pm.php?dopost=del&ids="+selid+"&folder="+myfolder;
-		}
-	}
-</script>
+  <meta charset="<?php echo $cfg_soft_lang; ?>">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <script src="<?php echo $cfg_cmsurl;?>/static/js/jquery.min.js"></script>
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/bootstrap.min.css">
+  <link href="<?php echo $cfg_cmsurl;?>/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/dede.css">
+  <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/member.css">
+  <title>消息管理 - 会员中心 - <?php echo $cfg_webname; ?></title>
 </head>
+
 <body>
-<div id="main">
-  <?php include(DEDEMEMBER."/templets/head.htm"); ?>
-  <div id="content" class="w960 clearfix">
-    <?php include(DEDEMEMBER."/templets/menu.php"); ?>
-    <div id="mcpmain">
-      <div id="appTab">
-        <ul>
-            <li><a href="pm.php?dopost=send"><span>写新消息</span></a></li>
-            <li <?php if($folder == "inbox" || empty($folder)) echo 'class="thisTab"'; ?>><a href="pm.php?folder=inbox"><span>收件箱</span></a></li>
-            <li <?php if($folder == "outbox") echo 'class="thisTab"'; ?>><a href="pm.php?folder=outbox"><span>发件箱</span></a></li>
-            <li <?php if($folder == "track") echo 'class="thisTab"'; ?>><a href="pm.php?folder=track"><span>已发出信息</span></a></li>
-        </ul>
-      </div>
-      <?php
-        if($folder == "inbox"){
-       ?>
-      <ul class="tabSub">
-        <li <?php if(empty($state)) echo 'class="thisTab"'; ?>><a href="pm.php?folder=<?php echo $folder;?>"><span>全部</span></a></li>
-        <li <?php if($state == "1") echo 'class="thisTab"'; ?>><a href="pm.php?folder=<?php echo $folder;?>&state=1"><span>已阅读</span></a></li>
-        <li <?php if($state == "-1") echo 'class="thisTab"'; ?>><a href="pm.php?folder=<?php echo $folder;?>&state=-1"><span>未阅读</span></a></li>
-      </ul>
-     <?php
-      }
-      ?>
-      <div id="mainCp">
-        <!--内容消息提示 -->
-        <h3 class="meTitle">短消息列表</h3>
-        <form action="pm.php" method="post" name="form1">
-        <input type='hidden' name='dopost' value='del' />
-        <table width="100%" border="0" cellpadding="0" cellspacing="0" class="list">
-            <thead>
-              <tr>
-                <th align="left" width="5%">&nbsp;</th>
-                <th >标题</th>
-                <th width="10%"><?php
-          	if($folder == "inbox") echo "发件人";
-          	else echo "收件人";
-          	?></th>
-                <th width="10%">状态 </th>
-                <th width="15%">发布时间 </th>
-              </tr>
-            </thead>
-         <tbody>
-            {dede:datalist}
-            <tr>
-              <td><input type="checkbox" name="deleteid" value="{dede:field.id/}" style=" margin-left:5px"/></td>
-              <td class="tabTitle"><?php
-           if($fields['hasview']==0) echo "<a href='pm.php?dopost=read&id={$fields['id']}'>{$fields['subject']}</a>";
-           else echo "<a href='pm.php?dopost=read&id={$fields['id']}'>{$fields['subject']}</a>";
-           ?></td>
-              <td align="center"><?php  if($folder == "inbox") {  ?>
-                <a href="index.php?uid=<?php echo $fields['floginid']; ?>" target="_blank"> <?php echo $fields['floginid']; ?> </a>
-                <?php  }else{  ?>
-                <a href="index.php?uid=<?php echo $fields['tologinid']; ?>" target="_blank"> <?php echo $fields['tologinid']; ?> </a>
-                <?php }  ?></td>
-              <td align="center"><?php
-          $readmsg = ($fields['hasview']==0 ? "<span style='color:red'>未阅读</span>" : '已阅读');
-          echo $readmsg;
+  <?php include(DEDEMEMBER."/templets/top_login.htm"); ?>
+
+  <main class="member">
+    <?php include(DEDEMEMBER."/templets/info.htm"); ?>
+
+    <div class="container-fluid pannel">
+      <div class="container">
+        <div class="row">
+          <?php
+          $_menu_pmex = true; // 展开短消息菜单
+          $_menu_pmstate = $state; // 当前活动菜单项目
           ?>
-              </td>
-              <td align="center"><?php
-          echo MyDate('y-m-d H:i:s',$fields['sendtime']);
-          ?></td>
-            </tr>
-            {/dede:datalist}
-            </tbody>
-          <tfoot>
-            <tr>
-              <td colspan="6">
-              <div class="control fLeft doPost" style="margin-top:10px"><button type="button" onclick="DoSubmit('<?php echo $folder; ?>')" class="greenBtn3">删除选中</button></div>
-              <div class="pageList">{dede:pagelist listsize=5 /}</div>
-              </td>
-            </tr>
-          </tfoot>
-        </table>
-         </form>
+          <?php include(DEDEMEMBER."/templets/menu.htm"); ?>
+          <div class="pannel-main col-md-9 mt-3 mb-3">
+            <div class="pannel-main-container">
+              <ul class="nav mt-2">
+                <li class="nav-item">
+                  <a class="nav-link<?php if($state === 0) echo ' active';?>"
+                    href="pm.php?folder=<?php echo $folder;?>">全部</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link<?php if($state === 1) echo ' active';?>"
+                    href="pm.php?folder=<?php echo $folder;?>&state=1">已阅读</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link<?php if($state === -1) echo ' active';?>"
+                    href="pm.php?folder=<?php echo $folder;?>&state=-1">未阅读</a>
+                </li>
+              </ul>
+              <div class="table-responsive">
+                <form action="pm.php" method="post" name="form1">
+                  <input type='hidden' name='dopost' value='del' />
+                  <table class="table">
+                    <thead>
+                      <tr>
+                        <th scope="col">&nbsp;</th>
+                        <th scope="col">标题</th>
+                        <th scope="col"><?php
+                        if($folder == "inbox") echo "发件人";
+                        else echo "收件人";
+                        ?></th>
+                        <th scope="col">状态</th>
+                        <th scope="col">发布时间</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {dede:datalist}
+                      <tr>
+                        <td scope="row"><input type="checkbox" name="deleteid" value="{dede:field.id/}"
+                            style=" margin-left:5px" /></td>
+                        <td><?php
+                        if($fields['hasview']==0) echo "<a href='pm.php?dopost=read&id={$fields['id']}'>{$fields['subject']}</a>";
+                        else echo "<a href='pm.php?dopost=read&id={$fields['id']}'>{$fields['subject']}</a>";
+                        ?></td>
+                        <td><?php 
+                        if($folder == "inbox") { 
+                          echo $fields['floginid']; 
+                        } else {  
+                          echo $fields['tologinid']; 
+                        }?>
+                        </td>
+                        <td>
+                          <?php
+                          $readmsg = ($fields['hasview']==0 ? "<span style='color:red'>未阅读</span>" : '已阅读');
+                          echo $readmsg;
+                        ?>
+                        </td>
+                        <td><?php
+                        echo MyDate('y-m-d H:i:s',$fields['sendtime']);
+                        ?></td>
+                      </tr>
+                      {/dede:datalist}
+                    </tbody>
+                  </table>
+                </form>
+              </div>
+              <nav>
+                <button class="btn btn-success btn-sm" type="button" onclick="DoSubmit('<?php echo $folder; ?>')"
+                  class="greenBtn3">删除选中</button> {dede:pagelist listsize=5 /}
+              </nav>
+            </div>
+          </div>
+        </div>
       </div>
-      <!--主操作区域 -->
     </div>
-  </div>
-<?php include(DEDEMEMBER."/templets/foot.htm"); ?>
-</div>
+  </main>
+
+  <?php include(DEDEMEMBER."/templets/footer.htm"); ?>
+  <script type="text/javascript">
+    //获得选中文件的文件名
+    function GetCheckfolderItem() {
+      var allSel = '';
+      if (document.form1.deleteid.value) return document.form1.deleteid.value;
+      for (i = 0; i < document.form1.deleteid.length; i++) {
+        if (document.form1.deleteid[i].checked) {
+          if (allSel == '')
+            allSel = document.form1.deleteid[i].value;
+          else
+            allSel = allSel + "," + document.form1.deleteid[i].value;
+        }
+      }
+      return allSel;
+    }
+
+    function DoSubmit(myfolder) {
+      var selid = GetCheckfolderItem();
+      if (selid == '') {
+        alert("你没选中任何信息！");
+        return false;
+      }
+      if (window.confirm("你确定要删除这些消息么？")) {
+        location = "pm.php?dopost=del&ids=" + selid + "&folder=" + myfolder;
+      }
+    }
+  </script>
 </body>
-</html>
+
+</html>

src/member/templets/reg-new.htm

@@ -1,208 +1,110 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html lang="zh-CN">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
-<title><?php echo $cfg_webname; ?>- 会员注册</title>
-<link href="templets/style/login.css" rel="stylesheet" type="text/css" />
-<script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
-<script src="templets/js/base.js" language="javascript" type="text/javascript"></script>
-<script src='templets/js/CheckPassStrength.js' type="text/javascript" language="javascript"></script>
-<script type="text/javascript" language="javascript" src='templets/js/reg_new.js'></script>
-<script type="text/javascript" language="javascript">
-<!--
-var reMethod = "<?php echo ($cfg_soft_lang == 'utf-8') ? 'POST' : 'GET';?>",pwdmin = <?php echo $cfg_mb_pwdmin; ?>;
+    <meta charset="<?php echo $cfg_soft_lang; ?>">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <script src="<?php echo $cfg_cmsurl;?>/static/js/jquery.min.js"></script>
+    <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/bootstrap.min.css">
+    <link href="<?php echo $cfg_cmsurl;?>/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/dede.css">
+    <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/member.css">
+    <title><?php echo $cfg_webname; ?>- 会员注册</title>
+</head>
 
-function changeAuthCode() {
-	var num = 	new Date().getTime();
-	var rand = Math.round(Math.random() * 10000);
-	num = num + rand;
-	$('#ver_code').css('visibility','visible');
-	if ($("#vdimgck")[0]) {
-		$("#vdimgck")[0].src = "../plus/vdimgck.php?tag=" + num;
-	}
-	return false;	
-}
+<body>
 
-function hideVc()
-{
-	$('#ver_code').css('visibility','hidden');
-}
+    <?php include(DEDEMEMBER."/templets/top.htm"); ?>
 
+    <?php include(DEDEMEMBER."/templets/header.htm"); ?>
 
-$(document).ready(function(){ 
-	$("#passwordLevel").removeClass().addClass("rank r0");
-	$("#vdcode").focus(function(){
-	  var leftpos = $("#vdcode").position().left;
-	  var toppos = $("#vdcode").position().top - 42;
-	  $('#ver_code').css('left', leftpos+'px');
-	  $('#ver_code').css('top', toppos+'px');
-	  $('#ver_code').css('visibility','visible');
-	});
-	$("input[type='password']").click(function(){
-	  hideVc()
-	});
-	$("#txtUsername").click(function(){
-	  hideVc()
-	});
-	$("input[type='radio']").focus(function(){
-	  hideVc()
-	});
-	/*
-	$("#vdcode").blur(function(){
-		  $('#ver_code').css('visibility','hidden');
-	});
-	*/
-})
+    <main class="login-from">
+        <div class="container">
+            <div class="login-area">
+                <h4 class="text-center py-2">会员注册</h4>
+                <form method="post" action="reg_new.php" id="regUser" name="form2" onsubmit="return CheckSubmit();">
+                    <input type="hidden" value="regbase" name="dopost" />
+                    <input type="hidden" value="1" name="step" />
+                    <input type="hidden" value="个人" name="mtype" />
+                    <div class="input-group mb-3">
+                        <input id="iptUserid" name="userid" type="text" class="form-control" placeholder="输入用户名">
+                    </div>
+                    <div class="form-group">
+                        <div class="input-group">
+                            <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate"
+                                style="text-transform:uppercase;">
+                            <img src="<?php echo $cfg_cmsurl;?>/plus/vdimgck.php" id="validateimg"
+                                style="cursor:pointer;"
+                                onclick="this.src='<?php echo $cfg_cmsurl;?>/plus/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)"
+                                title="点击我更换图片" alt="点击我更换图片" />
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="input-group">
+                            <input placeholder="登录密码" name="userpwd" type="password" class="form-control" id="iptUserpwd"
+                                style="text-transform:uppercase;">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="input-group">
+                            <input placeholder="确认密码" name="userpwdok" type="password" class="form-control" id="iptUserpwdok"
+                                style="text-transform:uppercase;">
+                        </div>
+                    </div>
+                    <div class="form-group form-check">
+                        <input type="checkbox" class="form-check-input" id="iptLicence">
+                        <label class="form-check-label licence" for="iptLicence">我已阅读并接受<a href="">《用户注册条款》</a>、<a
+                                href="">《隐私保护条例》</a></label>
+                    </div>
+                    <button type="submit" class="btn btn-success btnLogin">注 册</button>
+                    <a href="<?php echo $cfg_memberurl;?>/login.php"
+                        class="btn btn-outline-success btnLogin mt-2">登 录</a>
+                </form>
+            </div>
+        </div>
 
--->
-</script>
-</head>
-<body>
-<div class="header">
-  <div class="auto960">
-    <ul class="userMenu fRight">
-      <li> <a title="网站主页" href="../">网站主页</a> </li>
-      <li> <a title="注册" href="../member/index_do.php?fmdo=user&dopost=regnew">注册</a> </li>
-      <li> <a title="登录" href="../member/login.php">登录</a> </li>
-      <li class="help"> <a title="DEDECMS 帮助中心" href="http://help.dedecms.com">帮助</a> </li>
-    </ul>
-    <span>
-    <script type="text/javascript">
- var now=(new Date()).getHours();
- if(now>0&&now<=6){
-document.write("午夜好，");
- }else if(now>6&&now<=11){
- document.write("早上好，");
- }else if(now>11&&now<=14){
- document.write("中午好，");
- }else if(now>14&&now<=18){
- document.write("下午好，");
- }else{
- document.write("晚上好，");
- }
-</script>
-    <i class="green">游客</i> 你可以选择到 </span> </div>
-</div>
-<div class="wrapper">
-  <div class="logo fLeft"> <a href="/"> <img  style="margin:8px 0 0 25px;"alt="会员中心" src="../member/templets/images/login_logo.gif"/></a></div>
-  <div class="banner fRight"> <img src="../member/templets/images/530x56.gif" width="530" height="56" /></div>
-</div>
-<div id="login" class="bor" >
+    </main>
+
+    <?php include(DEDEMEMBER."/templets/footer.htm"); ?>
+    <script>
+      // CheckSubmit 校验注册提交表单
+      function CheckSubmit() {
+        let formCheck = [
+          {
+            elem : "#iptUserid",
+            condition : $("#iptUserid").val() === "",
+          },
+          {
+            elem : "#iptLicence",
+            condition : !$("#iptLicence").is(':checked'),
+          },
+          {
+            elem : "#iptValidate",
+            condition : $("#iptValidate").val() === "",
+          },
+          {
+            elem : "#iptUserpwd",
+            condition : $("#iptUserpwd").val() === "",
+          },
+          {
+            elem : "#iptUserpwdok",
+            condition : $("#iptUserpwdok").val() !== $("#iptUserpwd").val(),
+          },
+        ];
 
-  <div class="<?php echo ($cfg_mb_reginfo == 'Y')? '' : 's';?>tip1"></div>
-  <div class="theme fLeft">
-    <form method="post" action="reg_new.php" id="regUser" name="form2">
-      <input type="hidden" value="regbase" name="dopost"/>
-      <input type="hidden" value="1" name="step"/>
-      <input type="hidden" value="个人" name="mtype"/>
-      <p style="text-align: right;" class="mB10"/>
-      <ul>
-        <li class="mL68">(带<i class="red"> * </i>号的表示为必填项目，用户名必须大于3位小于20位，密码必须大于3位)</li>
-        <li><span>帐号类型：</span>
-         <?php
-         if(!file_exists(DEDEDATA.'/cache/member_model.inc'))
-         {
-         	   $dsql->SetQuery("SELECT * FROM `#@__member_model` WHERE state='1'");
-	           $dsql->Execute();
-	           while($row=$dsql->GetObject())
-	           {
-		             $_MemberMod[$row->id]=array($row->name,$row->table);
-           	 }
+        for (let i = 0; i < formCheck.length; i++) {
+          const fc = formCheck[i];
+          if (fc.condition) {
+            $(fc.elem).addClass("is-invalid");
+            return false
           } else {
-           	     require_once DEDEDATA.'/cache/member_model.inc';
+            $(fc.elem).removeClass("is-invalid");
           }
-            foreach ($_MemberMod as $type)
-            {
-                if($type[0] == '个人') echo ' <label><input type="radio" name="mtype" class="usermtype" value="'.$type[0].'" checked/>';
-                elseif($type[0] == '企业') echo ' <label><input type="radio" name="mtype" class="usermtype2" value="'.$type[0].'" />';
-                else echo ' <label><input type="radio" name="mtype" class="usermtype" value="'.$type[0].'" />';
-                echo $type[0], '</label> &nbsp;';
-            }
-        ?>
-        </li>
-        <li><span>用户名：</span>
-          <input type="text" class="intxt w200" id="txtUsername" name="userid"/>
-        <i class="red">*</i> <em id="_userid">(可以使用中文，但禁止除[@][.]以外的特殊符号)</em> </li>
-        <li><span id="uwname">用户笔名：</span>
-          <input type="text" class="intxt w200" size="20" id="uname" name="uname"/>
-          <i class="red">*</i> <em id="_uname"/> </li>
-        <li><span>登陆密码：</span>
-          <input type="password" onkeyup="setPasswordLevel(this, document.getElementById('passwordLevel'));" style="font-family: verdana;" class="intxt w200" id="txtPassword" name="userpwd"/>
-          <i class="red">*</i> </li>
-        <li><span>密码强度：</span>
-          <input id="passwordLevel" class="rank r2" disabled="disabled" name="Input"/>
-        </li>
-        <li><span>确认密码：</span>
-          <input type="password" class="intxt w200" size="20" value="" id="userpwdok" name="userpwdok"/>
-          <i class="red">*</i> <em id="_userpwdok"><font color="red"><b>×两次输入密码不一致</b></font></em> </li>
-          <?php
-            if($safe_faq_reg == '1'){
-            $faqkey = array_rand($safefaqs);
-          ?>
-          <li><span>请回答注册问题：</span>
-      	  <p class="cellBg">
-            <?php echo $safefaqs[$faqkey]['question'];?> (答案:<?php echo $safefaqs[$faqkey]['answer'];?>)
-           </li>
-          <li><span>您的回答是：</span>
-            <input name="rsafeanswer" type="text" id="rsafeanswer" size="25" style='width:200px;' class="intxt w200"/> 
-            <input type="hidden" name="faqkey" value="<?php echo $faqkey;?>" />
-            <i class="red">*</i> </li>
-          <?php
-          	}
-          ?>
-          <li><span>电子邮箱：</span>
-            <input type="text" class="intxt w200" id="email" name="email"/>
-            <i class="red">*</i> <em id="_email">(每个电子邮邮箱只能注册一个帐号)</em> </li>
-          <li><span>安全问题：</span>
-            <?php
-            require(DEDEDATA.'/safequestions.php');
-            echo GetSafequestion(0,'safequestion');
-            ?>
-          <em id="_safequestion">(忘记密码时重设密码用)</em> </li>
-          <li><span>问题答案：</span>
-          <input id="safeanswer" class="intxt w200" type="text" value="" name="safeanswer"/>
-          </li>
-        <li><span>性别：</span>
-            <input type="radio" value="男" name="sex"/>
-            男
-        <input type="radio" value="女" name="sex"/>
-            女
-            <input type="radio" checked="checked" value="" name="sex"/>
-          保密        </li>
-          <?php
-            if(preg_match("/1/",$safe_gdopen)){
-          ?>
-          <li><span>验证码：</span>
-            <input type="text" class="intxt w200" style="width: 50px; text-transform: uppercase;" id="vdcode" name="vdcode"/><img id="vdimgck" align="absmiddle" onclick="this.src=this.src+'?'" style="cursor: pointer;" alt="看不清？点击更换" src="../plus/vdimgck.php"/>
-           看不清？ <a href="javascript:void(0)" onclick="changeAuthCode();">点击更换</a></li>
-           <?php }?>
-      </ul>
-      <div><span style="height: 110px; width: 15%;" class="fLeft">会员注册协议：</span>
-        <div class="contract"> 1、在本站注册的会员，必须遵守《互联网电子公告服务管理规定》，不得在本站发表诽谤他人，侵犯他人隐私，侵犯他人知识产权，传播病毒，政治言论，商业讯息等信息。<br/>
-          2、在所有在本站发表的文章，本站都具有最终编辑权，并且保留用于印刷或向第三方发表的权利，如果你的资料不齐全，我们将有权不作任何通知使用你在本站发布的作品。<br/>
-        3、在登记过程中，您将选择注册名和密码。注册名的选择应遵守法律法规及社会公德。您必须对您的密码保密，您将对您注册名和密码下发生的所有活动承担责任。</div>
-      </div>
-      <br />
-      <ul>
-        <li><span>&nbsp;</span>
-          <input type="checkbox" checked="" value="" id="agree" name="agree"/>
-          我已阅读并完全接受服务协议 </li>
-        <li><span>&nbsp;</span>
-          <button type="submit" id="btnSignCheck" class="buttonGreen142">完 善 信 息</button>
-        </li>
-      </ul>
-    </form>
-  </div>
-  <br class="clear"/>
-</div>
-<script language="javascript" type="text/javascript">
-	window.onload=function (){
-		setInterval("document.getElementById('time').innerHTML=new Date().toLocaleString()+' 星期'+'日一二三四五六'.charAt(new Date().getDay());",1000);
-	}
-</script>
-<div class="footer bor">
-  <div class="fLeft mL10">Copyright &copy; 2004-2020 DedeCMS. 织梦科技 版权所有</div>
-  <div class="fRight mR10" id="time">  </div>
-</div>
+        }
+
+        return true
+      }
+    </script>
 </body>
+
 </html>

src/member/templets/shops_action_payment.htm

@@ -23,7 +23,7 @@
             <?php
             }else{
             ?>
-            <b><?php echo $cfg_ml->M_UserName; ?></b>,欢迎您的登陆。 <a href="<?php echo $cfg_memberurl; ?>/index.php">会员中心</a> |
+            <b><?php echo $cfg_ml->M_UserName; ?></b>,欢迎您的登录。 <a href="<?php echo $cfg_memberurl; ?>/index.php">会员中心</a> |
                 <a href="<?php echo $cfg_memberurl; ?>/edit_fullinfo.php">我的资料</a> |
                 <a href="<?php echo $cfg_memberurl; ?>/index.php?uid=<?php echo urlencode($cfg_ml->M_LoginID);?>">我的空间</a> |
                 <a href="<?php echo $cfg_memberurl; ?>/index_do.php?fmdo=login&dopost=exit">退出登录</a>

src/member/templets/top.htm

@@ -0,0 +1,10 @@
+<nav class="site-nav bg-light py-2">
+    <div class="container">
+        <div class="row">
+            <div class="col-12 d-flex justify-content-end user" id="_login">
+                <a href="<?php echo $cfg_memberurl;?>/login.php">登录</a>
+                <a class="ml-3" href="<?php echo $cfg_memberurl;?>/index_do.php?fmdo=user&dopost=regnew">注册</a>
+            </div>
+        </div>
+    </div>
+</nav>

src/member/templets/top_login.htm

@@ -0,0 +1,21 @@
+<div class="container header">
+    <header class="py-3">
+      <div class="row">
+        <div class="col-12 col-sm-6 logo"><a href="<?php echo $cfg_cmsurl;?>/"><img
+              src="<?php echo $cfg_cmsurl;?>/static/img/logo.gif" alt="<?php echo $cfg_webname;?>"></a></div>
+        <div class="col-12 col-sm-6 d-flex justify-content-end member-actions">
+          <a href="javascript:;" class="cart" title="订单管理"><i class="fa fa-shopping-cart" aria-hidden="true"></i></a>
+          <a href="pm.php" title="消息管理" class="message">
+            消息 <span class="badge badge-danger"><?php echo $pms['nums'];?></span>
+          </a>
+          <a>
+            <?php echo $cfg_ml->M_LoginID; ?>
+          </a>
+          <a href="<?php echo $cfg_cmsurl;?>/member/index_do.php?fmdo=login&dopost=exit#" title="退出">
+            <i class="fa fa-sign-out" aria-hidden="true"></i>
+          </a>
+        </div>
+      </div>
+    </header>
+  </div>
+  <!-- /.header -->

src/static/css/member.css

@@ -0,0 +1,123 @@
+/* Copyright 2020 The MuEMS Authors. All rights reserved.
+license that can be found in the LICENSE file. */
+
+main.login-from {
+    background-image: url('../img/member_bg.jpg');
+    background-repeat: no-repeat;
+    background-position: top center;
+    height: 620px;
+    padding-top: 5em;
+}
+
+
+.login-area {
+    background-color: white;
+    max-width: 500px;
+    padding: 1em;
+    float: right;
+}
+
+.login-area .btnLogin {
+    width: 100%;
+    padding: .5em;
+}
+
+.login-area small.des {
+    color: #B5B5B5;
+}
+
+.login-area .licence {
+    font-size: 14px;
+}
+
+.login-area .licence a {
+    color: #008E38;
+}
+
+.copyright.light {
+    background-color: white;
+}
+
+.flink,
+.flink a,
+.copyright.light,
+.copyright.light a {
+    color: #666666;
+}
+
+
+.member a {
+    color: #008E38;
+}
+.member .member-actions {
+    font-size: 16px;
+}
+
+.member .member-logo {
+    border-radius: 50%;
+}
+
+.member-actions a {
+    color: #868686;
+    margin-left: 1em;
+    line-height: 64px;
+}
+
+main.member {
+    background: url("../img/member_home_bg.jpg");
+    background-repeat: no-repeat;
+    background-position: top center;
+}
+
+.member .member-rank a {
+    color: white;
+}
+
+.member .member-info {
+    padding-top: 12em;
+}
+
+.member .member-type span {
+    padding: .6em;
+    position: relative;
+    top: -12px;
+}
+
+.member .pannel {
+    background-color: #F3F3F3;
+}
+
+.member .pannel .dropdown {
+    display: inline-block;
+    margin-left: .255em;
+    vertical-align: .255em;
+    content: "";
+    border-top: .3em solid;
+    border-right: .3em solid transparent;
+    border-bottom: 0;
+    border-left: .3em solid transparent;
+}
+
+.member .pannel .pannel-main .pannel-main-container {
+    background-color: white;
+    padding: 1em;
+}
+
+.member .list-group-item.active a {
+    color: white;
+}
+
+.member .member-menu .list-group-flush>.list-group-item {
+    cursor: pointer;
+}
+
+.member .pannel-main .nav-link.active {
+    font-weight: bold;
+}
+
+@media only screen and (max-width: 576px) {
+    .login-area {
+        float: none;
+        margin: auto;
+    }
+}