diff --git a/src/admin/cards_type.php b/src/admin/cards_type.php index f244d358..a750aaed 100644 --- a/src/admin/cards_type.php +++ b/src/admin/cards_type.php @@ -11,7 +11,6 @@ require_once(dirname(__FILE__).'/config.php'); CheckPurview('member_Type'); if (empty($dopost)) $dopost = ""; - //保存修改 if ($dopost == "save") { $startID = 1; @@ -36,7 +35,6 @@ if ($dopost == "save") { $dsql->ExecuteNoneQuery($query); } } - //增加新记录 if (isset($check_new) && $pname_new != '') { $query = "INSERT INTO `#@__moneycard_type` (num,pname,money) VALUES ('{$num_new}','{$pname_new}','{$money_new}');"; diff --git a/src/admin/templets/cards_make.htm b/src/admin/templets/cards_make.htm index c222473d..f11361ca 100644 --- a/src/admin/templets/cards_make.htm +++ b/src/admin/templets/cards_make.htm @@ -3,7 +3,7 @@ - 积分生成向导 + 生成积分 @@ -16,7 +16,7 @@ - + - - + + @@ -76,14 +76,7 @@ diff --git a/src/admin/templets/member_view.htm b/src/admin/templets/member_view.htm index 61b4287b..b63b2780 100644 --- a/src/admin/templets/member_view.htm +++ b/src/admin/templets/member_view.htm @@ -38,19 +38,15 @@ - + - + diff --git a/src/install/install.html b/src/install/install.html index b259ac83..23c35c5e 100644 --- a/src/install/install.html +++ b/src/install/install.html @@ -11,7 +11,7 @@ - +
diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index e04d30d3..a833626c 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -529,15 +529,15 @@ INSERT INTO `#@__flinktype` VALUES ('1','综合网站'), INSERT INTO `#@__freelist` VALUES ('1','测试文档','{listdir}/index_{listid}_{page}.html','{cmspath}/freelist/','index.html','1','{style}/list_free.htm','1289712633','100','0','{dede:list pagesize="30" col="1" titlelen="60" orderby="pubdate" orderway="desc" typeid="1" channel="1" }
  • [field:imglink/] [field:textlink/] 日期：[field:pubdate function="getdatemk(@me)"/] 浏览：[field:click/] 好评：[field:scores/] \t\n

    [field:description/]

    • {/dede:list}','测试','测试文档'), ('10','Google SiteMap 生成器','{listdir}googlemap_{page}.xml','{cmspath}','index.html','1','{style}/googlemap.htm','1226884666','100','0','{dede:list pagesize="500" col="1" titlelen="60" orderby="pubdate" orderway="desc"\t\nchannel="1" keyword=""}\t\n[field:arcurl function="Gmapurl(@me)"/]\t\n[field:title function="HtmlReplace(@me)"/]\t\n\t\n[field:keywords/]\t\n[field:senddate function="strftime('%Y-%m-%d',@me)"/]\t\n\t\n{/dede:list}','',''); -INSERT INTO `#@__member_type` VALUES ('1','50','中级会员半年','100','7'); +INSERT INTO `#@__member_type` VALUES ('1','50','中级会员半年','100','30'); INSERT INTO `#@__homepageset` VALUES ('{style}/index.htm','../index.html','0'); -INSERT INTO `#@__moneycard_type` VALUES ('1','100','30','100积分'), -('2','200','55','200积分'), -('3','300','75','300积分'); +INSERT INTO `#@__moneycard_type` VALUES ('1','100','30','金币套餐一'), +('2','200','55','金币套餐二'), +('3','300','75','金币套餐三'); -INSERT INTO `#@__member_model` VALUES ('1','个人','#@__member_person','个人会员模型','1','1','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n'), +INSERT INTO `#@__member_model` VALUES ('1','个人','#@__member_person','个人会员模型','1','1','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n'), ('2','企业','#@__member_company','公司企业会员模型','1','1','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n'); INSERT INTO `#@__scores` VALUES ('2','列兵','1','0','1'), diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 51bbf3ec..62f8138b 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -28,7 +28,7 @@ h1,h2,h3,h4,h5,h6 { color:#393d49 } h1 { - font-size:32px + font-size:36px } h2 { font-size:24px @@ -300,7 +300,7 @@ input[type=file] { .form-control,.btn,.fa { font-size:14px!important } -.form-control { +.form-control,.input-text { height:36px; line-height:36px } @@ -383,12 +383,6 @@ input[type=file] { max-width:260px; max-height:156px } -.file-relative { - position:relative -} -.file-absolute { - display: none; -} #btnScrollTop { display:none; position:fixed; diff --git a/src/system/common.func.php b/src/system/common.func.php index a7a89c8b..108a5485 100755 --- a/src/system/common.func.php +++ b/src/system/common.func.php @@ -9,7 +9,7 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -//显示类似Bootstrap系统提示 +//显示类似Bootstrap警告框 define('ALERT_PRIMARY', 1); define('ALERT_SECONDARY', 2); define('ALERT_SUCCESS', 3); @@ -93,7 +93,7 @@ function get_mime_type($filename) if (!function_exists('finfo_open')) { return 'unknow/octet-stream'; } - $finfo = finfo_open(FILEINFO_MIME_TYPE); + $finfo = finfo_open(FILEINFO_MIME_TYPE); $mimeType = finfo_file($finfo, $filename); finfo_close($finfo); return $mimeType; @@ -108,9 +108,7 @@ function is_all_numeric(array $array) function make_hash() { $rand = dede_random_bytes(16); - $_SESSION['token'] = ($rand === FALSE) - ? md5(uniqid(mt_rand(), TRUE)) - : bin2hex($rand); + $_SESSION['token'] = ($rand === FALSE) ? md5(uniqid(mt_rand(), TRUE)) : bin2hex($rand); return $_SESSION['token']; } function dede_random_bytes($length) @@ -154,7 +152,6 @@ if (!function_exists('CheckSql')) { //如果是普通查询语句，直接过滤一些特殊语法 if ($querytype == 'select') { $notallow1 = "[^0-9a-z@\._-]{1,}(union|sleep|benchmark|load_file|outfile)[^0-9a-z@\.-]{1,}"; - //$notallow2 = "--|/\*"; if (preg_match("/".$notallow1."/i", $db_string)) { fputs(fopen($log_file, 'a+'), "$userIP||$getUrl||$db_string||SelectBreak\r\n"); exit("Safe Alert: Request Error step 1 !"); @@ -493,7 +490,6 @@ function GetUpdateSQL() $query = preg_replace('/,([\t\s ]+)PRIMARY KEY([\t\s ]+)\(`([0-9a-zA-Z]+)`\)/i','',$query); } $sqls[] = $query; - // $db->exec($query); } else { if (preg_match('#CREATE#i', $query)) { $sqls[] = preg_replace("#TYPE=MyISAM#i",$sql4tmp,$query); @@ -676,7 +672,6 @@ function HideEmail($email) $em = explode("@",$email); $name = implode('@', array_slice($em, 0, count($em)-1)); $len = floor(strlen($name)/2); - return substr($name,0, $len) . str_repeat('*', $len) . "@" . end($em); } //自定义函数接口 diff --git a/src/user/buy.php b/src/user/buy.php index 6396ceb4..abb761d2 100755 --- a/src/user/buy.php +++ b/src/user/buy.php @@ -21,8 +21,8 @@ while ($row = $dsql->GetObject('mct')) { $moneycards .= "
    - - + + "; } @@ -35,7 +35,7 @@ while ($row = $dsql->GetObject('mt')) { - + "; } diff --git a/src/user/edit_baseinfo.php b/src/user/edit_baseinfo.php index 660e4f63..07611c82 100755 --- a/src/user/edit_baseinfo.php +++ b/src/user/edit_baseinfo.php @@ -32,7 +32,6 @@ if ($dopost == 'save') { ShowMsg('您两次输入的新密码不一致', '-1'); exit(); } - $addupquery = ''; $admaddupquery = ''; $pp = "pwd"; @@ -83,7 +82,6 @@ if ($dopost == 'save') { } } } - //修改安全问题 if ($newsafequestion != 0 && $newsafeanswer != '') { if (strlen($newsafeanswer) > 30) { diff --git a/src/user/templets/album_add.htm b/src/user/templets/album_add.htm index 971ccdda..abadd8c9 100755 --- a/src/user/templets/album_add.htm +++ b/src/user/templets/album_add.htm @@ -39,7 +39,7 @@
    - 上传缩略图 + 上传缩略图
    @@ -88,7 +88,7 @@ - 上传图片（支持多选） + 上传图片（支持多选）
    diff --git a/src/user/templets/album_edit.htm b/src/user/templets/album_edit.htm index 6db7cf93..cf3b32ea 100755 --- a/src/user/templets/album_edit.htm +++ b/src/user/templets/album_edit.htm @@ -43,7 +43,7 @@
    - 修改缩略图 + 修改缩略图
    diff --git a/src/user/templets/archives_add.htm b/src/user/templets/archives_add.htm index d9f69ca9..cd02c3c5 100755 --- a/src/user/templets/archives_add.htm +++ b/src/user/templets/archives_add.htm @@ -38,7 +38,7 @@
    - 上传缩略图 + 上传缩略图
    diff --git a/src/user/templets/archives_edit.htm b/src/user/templets/archives_edit.htm index 319f42da..ad6417ae 100755 --- a/src/user/templets/archives_edit.htm +++ b/src/user/templets/archives_edit.htm @@ -38,7 +38,7 @@
    - 修改缩略图 + 修改缩略图
    diff --git a/src/user/templets/archives_sg_add.htm b/src/user/templets/archives_sg_add.htm index 7f5528cd..656be9e8 100755 --- a/src/user/templets/archives_sg_add.htm +++ b/src/user/templets/archives_sg_add.htm @@ -38,7 +38,7 @@
    - 上传缩略图 + 上传缩略图
    diff --git a/src/user/templets/archives_sg_edit.htm b/src/user/templets/archives_sg_edit.htm index 1b65547a..d60fd213 100755 --- a/src/user/templets/archives_sg_edit.htm +++ b/src/user/templets/archives_sg_edit.htm @@ -38,7 +38,7 @@
    - 修改缩略图 + 修改缩略图
    diff --git a/src/user/templets/article_add.htm b/src/user/templets/article_add.htm index a0e0de6d..ecc50ba2 100755 --- a/src/user/templets/article_add.htm +++ b/src/user/templets/article_add.htm @@ -38,7 +38,7 @@
    - 上传缩略图 + 上传缩略图
    diff --git a/src/user/templets/article_edit.htm b/src/user/templets/article_edit.htm index 8cc545b0..e7b28e38 100755 --- a/src/user/templets/article_edit.htm +++ b/src/user/templets/article_edit.htm @@ -42,7 +42,7 @@
    - 修改缩略图 + 修改缩略图
    diff --git a/src/user/templets/buy.htm b/src/user/templets/buy.htm index dd67e279..8987ef57 100755 --- a/src/user/templets/buy.htm +++ b/src/user/templets/buy.htm @@ -75,9 +75,9 @@
    积分生成向导生成积分 diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm index f96cbd00..cf9f30a9 100644 --- a/src/admin/templets/member_main.htm +++ b/src/admin/templets/member_main.htm @@ -63,8 +63,8 @@
    选择 mid头像/用户名/类型公司名/昵称头像/用户名昵称 等级 钱包积分 投稿限制 {dede:field.mid/} - - ";}; - echo ''.$fields['userid'].''; - if ($fields['spacesta']==-2) echo " 禁言"; - if ($fields['spacesta']==-1) echo " 未审核"; - ?> - + ";};echo ''.$fields['userid'].'';if ($fields['spacesta']==-2) echo " 禁言";if ($fields['spacesta']==-1) echo " 未审核";?> {dede:field.matt function="GetMAtt(@me)"/} {dede:field.uname/}
    头像/用户名/类型：头像/用户名： - - ";}; - echo "".$row['userid'].""; - ?> - - + ";};echo "".$row['userid']."";?> + 高级会员 + 少尉
    公司名/昵称：昵称：
    {$row->pname}{$row->num}个{$row->money}元{$row->num}{$row->money}
    {$row->pname} {$row->membername} {$row->exptime}{$row->money}元{$row->money}
    - - - + + + @@ -93,10 +93,10 @@
    选择积分类型金币数量购买价格产品名称金币数量（个）价格（元）
    - + - + diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm index 66782813..220b79f4 100755 --- a/src/user/templets/edit_baseinfo.htm +++ b/src/user/templets/edit_baseinfo.htm @@ -48,92 +48,70 @@
    - -
    +
    - + +
    M_LoginID;?>
    +
    +
    + +
    +
    +
    +
    + 修改头像
    - -
    - - M_LoginID;?> - - - - -
    + +
    - -
    + +
    - -
    + +
    - -
    + +
    - -
    + +
    - -
    - -
    + +
    - -
    + +
    - +
    - -
    -
    -
    - -
    -
    -
    - -
    - - 修改邮箱 - +
    + + 修改邮箱 +
    - -
    - - - + +
    + + +
    @@ -161,11 +139,9 @@ } }); }) - $("#btnChangeFace").click(function(){ $("#iptNewface").click(); }) - $("#iptNewface").change(function (val) { var formData = new FormData(); var fileData = $('#iptNewface')[0].files[0]; @@ -188,8 +164,6 @@ }); }); }); - - \ No newline at end of file diff --git a/src/user/templets/index.htm b/src/user/templets/index.htm index 42623281..1262f7bc 100755 --- a/src/user/templets/index.htm +++ b/src/user/templets/index.htm @@ -23,9 +23,10 @@
    -
    +

    M_LoginID;?>

    - M_MbType;?> + 高级会员 + 少尉

    积分：M_Scores;?> diff --git a/src/user/templets/soft_add.htm b/src/user/templets/soft_add.htm index b05b0ba5..9be18632 100755 --- a/src/user/templets/soft_add.htm +++ b/src/user/templets/soft_add.htm @@ -55,7 +55,7 @@

    - 上传缩略图 + 上传缩略图
    diff --git a/src/user/templets/soft_edit.htm b/src/user/templets/soft_edit.htm index 231d60dd..2e9c1035 100755 --- a/src/user/templets/soft_edit.htm +++ b/src/user/templets/soft_edit.htm @@ -58,7 +58,7 @@
    - 修改缩略图 + 修改缩略图
    选择产品名称产品名称 会员类型 时限（天）价格价格（元）