DedeBIZ
/
DedeV6
Watch 2
Star 0
Fork 0
Code Pull Requests 0 Releases 25 Activity
Browse Source

Merge branch 'develop' of https://www.zhelixie.com/DedeBIZ/DedeCMSV6 into develop

tags/6.2.8
tianya 11 months ago
parent
5d210d0990 9a4be56281
commit
cf6a2662d9
37 changed files with 90 additions and 141 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      src/admin/inc/inc_archives_all.php
  2. +2
    -2
      src/admin/mychannel_edit.php
  3. +1
    -1
      src/admin/templets/album_add.htm
  4. +1
    -1
      src/admin/templets/archives_add.htm
  5. +1
    -1
      src/admin/templets/article_description_main.htm
  6. +1
    -1
      src/admin/templets/catalog_add.htm
  7. +2
    -2
      src/admin/templets/freelist_add.htm
  8. +5
    -5
      src/admin/templets/login.htm
  9. +1
    -1
      src/admin/templets/makehtml_homepage.htm
  10. +1
    -1
      src/admin/templets/member_rank.htm
  11. +7
    -7
      src/admin/templets/soft_add.htm
  12. +1
    -1
      src/admin/templets/spec_add.htm
  13. +1
    -1
      src/admin/templets/spec_edit.htm
  14. +2
    -2
      src/admin/templets/sys_data.htm
  15. +1
    -1
      src/admin/templets/sys_sql_query.htm
  16. +1
    -1
      src/admin/templets/templets_one_add.htm
  17. +4
    -4
      src/admin/templets/vote_add.htm
  18. +3
    -3
      src/apps/view.php
  19. +1
    -1
      src/system/customfields.func.php
  20. +1
    -0
      src/theme/apps/advancedsearch.htm
  21. +1
    -0
      src/theme/apps/download_links.htm
  22. +1
    -0
      src/theme/apps/flink_add.htm
  23. +1
    -0
      src/theme/apps/flink_list.htm
  24. +2
    -1
      src/theme/apps/heightsearch.htm
  25. +1
    -0
      src/theme/apps/list_diyform.htm
  26. +1
    -0
      src/theme/apps/recommend.htm
  27. +1
    -0
      src/theme/apps/showphoto.htm
  28. +1
    -0
      src/theme/apps/view_diyform.htm
  29. +1
    -0
      src/theme/apps/view_msg.htm
  30. +1
    -0
      src/theme/apps/view_msg_catalog.htm
  31. +1
    -0
      src/theme/apps/vote.htm
  32. +1
    -0
      src/theme/apps/win_templet.htm
  33. +8
    -8
      src/user/templets/login.htm
  34. +10
    -46
      src/user/templets/reg-new.htm
  35. +7
    -38
      src/user/templets/resetpassword.htm
  36. +12
    -9
      src/user/templets/resetpassword2.htm
  37. +1
    -1
      src/user/templets/resetpassword3.htm

+ 2
- 2
src/admin/inc/inc_archives_all.php View File

@@ -48,7 +48,7 @@ function GetFormItem($ctag)
$i = 0;
if ($v != '') {
if ($i == 0) {
$myformItem .= "<label><input type='radio' name='$fieldname' value='$v' checked> $v</label>\r\n";
$myformItem .= "<label><input type='radio' name='$fieldname' value='$v' checked='checked'> $v</label>\r\n";
} else {
$myformItem .= "<label><input type='radio' name='$fieldname' value='$v'> $v</label>\r\n";
}
@@ -247,7 +247,7 @@ function GetFormItemValue($ctag, $fvalue)
$v = trim($v);
if ($v != '') {
if ($fvalue == $v) {
$myformItem .= "<label><input type='radio' name='$fieldname' value='$v' checked> $v</label>\r\n";
$myformItem .= "<label><input type='radio' name='$fieldname' value='$v' checked='checked'> $v</label>\r\n";
} else {
$myformItem .= "<label><input type='radio' name='$fieldname' value='$v'> $v</label>\r\n";
}


+ 2
- 2
src/admin/mychannel_edit.php View File

@@ -399,7 +399,7 @@ if ($dopost == "show") {
$label = $ctag->GetAtt('itemname');
if (in_array($datatype, $searchtype)) {
$checked = in_array($value, $addonfieldsarr) ? 'checked' : '';
$addonfields .= "<label><input type='checkbox' name='addonfields[]' value='$value' $checked> $label</label> ";
$addonfields .= "<label><input type='checkbox' name='addonfields[]' value='$value' $checked='checked'> $label</label> ";
}
}
}
@@ -501,7 +501,7 @@ if ($dopost == "show") {
} else if ($type == 'radio') {
$values = explode(',', $valuearr[$k]);
if (is_array($values) && !empty($values)) {
$forms .= "$itemname：<label><input type=\"radio\" name=\"".$name."\" value=\"\" checked> 不限</label><br>";
$forms .= "$itemname：<label><input type=\"radio\" name=\"".$name."\" value=\"\" checked=\"checked\"> 不限</label><br>";
foreach ($values as $value) {
$forms .= "<label><input type=\"radio\" name=\"".$name."\" value=\"$value\"> $value</label>";
}


+ 1
- 1
src/admin/templets/album_add.htm View File

@@ -289,7 +289,7 @@
</td>
<td width="120">发布选项：</td>
<td>
<label><input type="radio" name="ishtml" value="1" checked> 生成网页</label>
<label><input type="radio" name="ishtml" value="1" checked="checked"> 生成网页</label>
<label><input type="radio" name="ishtml" value="0"> 仅动态浏览</label>
</td>
</tr>


+ 1
- 1
src/admin/templets/archives_add.htm View File

@@ -222,7 +222,7 @@
</td>
<td width="120">发布选项：</td>
<td>
<label><input type="radio" name="ishtml" value="1" checked> 生成网页</label>
<label><input type="radio" name="ishtml" value="1" checked="checked"> 生成网页</label>
<label><input type="radio" name="ishtml" value="0"> 仅动态浏览</label>
</td>
</tr>


+ 1
- 1
src/admin/templets/article_description_main.htm View File

@@ -53,7 +53,7 @@
<tr>
<td width="120">操作：</td>
<td>
<label><input type="radio" name="dojob" value="des" checked> 自动摘要</label>
<label><input type="radio" name="dojob" value="des" checked="checked"> 自动摘要</label>
<label><input type="radio" name="dojob" value="page"> 自动分页</label>
</td>
<td width="120">自动分页大小：</td>


+ 1
- 1
src/admin/templets/catalog_add.htm View File

@@ -265,7 +265,7 @@
<td>
<input type="text" name="apikey" id="apikey" class="admin-input-lg" placeholder="请输入跨站调用秘钥">
<label class="l-height-28"><input type="radio" name="apienabled" value="1"> 支持</label>
<label class="l-height-28"><input type="radio" name="apienabled" value="0" checked> 不支持</label>
<label class="l-height-28"><input type="radio" name="apienabled" value="0" checked="checked"> 不支持</label>
<span class="btn btn-success btn-sm ml-2" title="更新秘钥" onclick="makeAPIKey()"><i class="fa fa-repeat"></i></span>
</td>
</tr>


+ 2
- 2
src/admin/templets/freelist_add.htm View File

@@ -47,7 +47,7 @@
<label><img src="../static/web/img/g_t3.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="3"></label>
</td>
<td>
<label><img src="../static/web/img/g_t4.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="4" checked></label>
<label><img src="../static/web/img/g_t4.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="4" checked="checked"></label>
</td>
</tr>
</table>
@@ -162,7 +162,7 @@
<option value="lastpost">最后评论时间</option>
<option value="postnum">评论总数</option>
</select>
<label class="l-height-28"><input type="radio" name="order" value="desc" checked> 由高到低</label>
<label class="l-height-28"><input type="radio" name="order" value="desc" checked="checked"> 由高到低</label>
<label class="l-height-28"><input type="radio" name="order" value="asc"> 由低到高</label>
</td>
</tr>


+ 5
- 5
src/admin/templets/login.htm View File

@@ -39,15 +39,15 @@
<input type="hidden" name="dopost" value="login">
<input type="hidden" name="adminstyle" value="newDedeBIZ">
<div class="form-group">
<label for="iptUserid">管理员账号</label>
<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入管理员账号">
<label>管理员账号</label>
<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入管理员账号" required="required">
</div>
<div class="form-group">
<label for="iptPassword">管理员密码</label>
<input type="password" name="pwd" id="iptPassword" class="form-control" placeholder="请输入管理员密码">
<label>管理员密码</label>
<input type="password" name="pwd" id="iptPwd" class="form-control" placeholder="请输入管理员密码" required="required">
</div>
<div id="vdimgck" class="form-group" style="display:none">
<label for="iptValidate">验证码</label>
<label>验证码</label>
<div class="input-group">
<input type="text" name="validate" id="iptValidate" class="form-control text-uppercase" placeholder="请输入验证码">
<img src="../apps/vdimgck.php" onclick="this.src='../apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码" id="validateimg">


+ 1
- 1
src/admin/templets/makehtml_homepage.htm View File

@@ -37,7 +37,7 @@
<td>相关选项：</td>
<td>
<label><input type="radio" name="saveset" value="0"> 不保存当前选项</label>
<label><input type="radio" name="saveset" value="1" checked> 保存当前选项</label>
<label><input type="radio" name="saveset" value="1" checked="checked"> 保存当前选项</label>
</td>
</tr>
<tr>


+ 1
- 1
src/admin/templets/member_rank.htm View File

@@ -65,7 +65,7 @@
<td><input type="text" name="rank_new" id="rank_new" value="20"></td>
<td><input type="text" name="money_new" id="money_new" value="0"></td>
<td><input type="text" name="scores_new" id="scores_new" value="100"></td>
<td><input type="checkbox" name="check_new" id="check_new" value="1" checked> 添加等级</td>
<td><input type="checkbox" name="check_new" id="check_new" value="1" checked="checked"> 添加等级</td>
<td></td>
</tr>
<tr>


+ 7
- 7
src/admin/templets/soft_add.htm View File

@@ -277,7 +277,7 @@
<option value="KB">KB</option>
<option value="GB">GB</option>
</select>
<label><input type="checkbox" name="autosize" id="autosize" value="1" checked>自动获取</label>
<label><input type="checkbox" name="autosize" id="autosize" value="1" checked="checked">自动获取</label>
</td>
<td width="120">需会员权限：</td>
<td align="left">
@@ -332,11 +332,11 @@
?>
<div class="py-2">
<?php echo $sitename;?>
<input type='hidden' name='forconfig<?php echo $startNum;?>' value='1'>
<input type='text' name='softurlfirst<?php echo $startNum;?>' class='admin-input-lg' value='<?php echo $siteurl;?>'> +
<input type='text' name='softurl<?php echo $startNum;?>' class='admin-input-sm'> =
<input type='text' name='servermsg<?php echo $startNum;?>' class='admin-input-sm' value='<?php echo $sitename;?>'>
<label><input type='checkbox' name='need<?php echo $startNum;?>' value='1' checked> 启用</label>
<input type="hidden" name="forconfig<?php echo $startNum;?>" value="1">
<input type="text" name="softurlfirst<?php echo $startNum;?>" class="admin-input-lg" value="<?php echo $siteurl;?>"> +
<input type="text" name="softurl<?php echo $startNum;?>" class="admin-input-sm"> =
<input type="text" name="servermsg<?php echo $startNum;?>" class="admin-input-sm" value="<?php echo $sitename;?>">
<label><input type="checkbox" name="need<?php echo $startNum;?>" value="1" checked="checked"> 启用</label>
</div>
<?php
$startNum++;
@@ -392,7 +392,7 @@
</td>
<td width="120">发布选项：</td>
<td>
<label><input type="radio" name="ishtml" value="1" checked> 生成网页</label>
<label><input type="radio" name="ishtml" value="1" checked="checked"> 生成网页</label>
<label><input type="radio" name="ishtml" value="0"> 仅动态浏览</label>
</td>
</tr>


+ 1
- 1
src/admin/templets/spec_add.htm View File

@@ -171,7 +171,7 @@
<td class="admin-td">
<label>栏目id：<input type="text" name="typeid<?php echo $i?>" id="_typeid<?php echo $i?>" value="0" class="admin-input-sm"></label>
<label>关键词：<input type="text" name="keywords<?php echo $i?>" id="keywords<?php echo $i?>" value="" class="admin-input-lg">（英文逗号分开）</label>
<label><input type="radio" name="isauto<?php echo $i?>" id="isauto<?php echo $i?>" value="0" checked> 按文档列表</label>
<label><input type="radio" name="isauto<?php echo $i?>" id="isauto<?php echo $i?>" value="0" checked="checked"> 按文档列表</label>
<label><input type="radio" name="isauto<?php echo $i?>" id="isauto<?php echo $i?>" value="1"> 自动获取文档</label>
</td>
</tr>


+ 1
- 1
src/admin/templets/spec_edit.htm View File

@@ -229,7 +229,7 @@
<td class="admin-td">
<label>栏目id：<input type="text" name="typeid<?php echo $i?>" id="_typeid<?php echo $i?>" value="0" class="admin-input-sm"></label>
<label>关键词：<input type="text" name="keywords<?php echo $i?>" id="keywords<?php echo $i?>" value="" class="admin-input-lg">（空格分开）</label>
<label><input type="radio" name="isauto<?php echo $i?>" id="isauto<?php echo $i?>" value="0" checked> 按文档列表</label>
<label><input type="radio" name="isauto<?php echo $i?>" id="isauto<?php echo $i?>" value="0" checked="checked"> 按文档列表</label>
<label><input type="radio" name="isauto<?php echo $i?>" id="isauto<?php echo $i?>" value="1"> 自动获取文档</label>
</td>
</tr>


+ 2
- 2
src/admin/templets/sys_data.htm View File

@@ -46,7 +46,7 @@
$t = $dedeSysTables[$i];
echo "<tr align='center'>";
?>
<td><input type="checkbox" name="tables" value="<?php echo $t;?>" checked></td>
<td><input type="checkbox" name="tables" value="<?php echo $t;?>" checked="checked"></td>
<td><?php echo $t;?></td>
<td><?php echo TjCount($t,$dsql);?></td>
<td>
@@ -59,7 +59,7 @@
if (isset($dedeSysTables[$i])) {
$t = $dedeSysTables[$i];
?>
<td><input type="checkbox" name="tables" value="<?php echo $t;?>" checked></td>
<td><input type="checkbox" name="tables" value="<?php echo $t;?>" checked="checked"></td>
<td><?php echo $t;?></td>
<td><?php echo TjCount($t,$dsql);?></td>
<td>


+ 1
- 1
src/admin/templets/sys_sql_query.htm View File

@@ -61,7 +61,7 @@
<td colspan="2">
<span>运行SQL命令行：</span>
<label><input type="radio" name="querytype" value="0"> 单行命令</label>
<label><input type="radio" name="querytype" value="2" checked> 多行命令</label>
<label><input type="radio" name="querytype" value="2" checked="checked"> 多行命令</label>
</td>
</tr>
<tr>


+ 1
- 1
src/admin/templets/templets_one_add.htm View File

@@ -64,7 +64,7 @@
<td>是否编译文档：</td>
<td>
<?php if (!DEDEBIZ_SAFE_MODE) {?><label><input type="radio" name="ismake" value="1"> 含模板标记，要编译</label><?php }?>
<label><input type="radio" name="ismake" value="0" checked> 不含模板标记，不需要编译</label>
<label><input type="radio" name="ismake" value="0" checked="checked"> 不含模板标记，不需要编译</label>
</td>
</tr>
<tr>


+ 4
- 4
src/admin/templets/vote_add.htm View File

@@ -39,14 +39,14 @@
<td>是否允许游客投票：</td>
<td>
<label><input type="radio" name="isallow" value="0"> 是</label>
<label><input type="radio" name="isallow" value="1" checked> 否</label>
<label><input type="radio" name="isallow" value="1" checked="checked"> 否</label>
</td>
</tr>
<tr>
<td>是否允许查看投票：</td>
<td>
<label><input type="radio" name="view" value="0"> 是</label>
<label><input type="radio" name="view" value="1" checked> 否</label>
<label><input type="radio" name="view" value="1" checked="checked"> 否</label>
</td>
</tr>
<tr>
@@ -59,7 +59,7 @@
<tr>
<td>是否多选：</td>
<td>
<label><input type="radio" name="ismore" value="0" checked> 单选</label>
<label><input type="radio" name="ismore" value="0" checked="checked"> 单选</label>
<label><input type="radio" name="ismore" value="1"> 多选</label>
</td>
</tr>
@@ -79,7 +79,7 @@
<tr>
<td>是否启用：</td>
<td>
<label><input type="radio" name="isenable" value="0" checked> 是</label>
<label><input type="radio" name="isenable" value="0" checked="checked"> 是</label>
<label><input type="radio" name="isenable" value="1"> 否</label>
</td>
</tr>


+ 3
- 3
src/apps/view.php View File

@@ -55,7 +55,7 @@ if ($needMoney > 0 || $needRank > 1) {
if (!is_array($row)) {
if ($cfg_ml->M_Money == '' || $needMoney > $cfg_ml->M_Money) {
$msgtitle = "您没有权限浏览文档：{$arctitle} ";
$moremsg = "该文档需要<span class='text-primary'>".$needMoney."</span>金币才能浏览，您目前金币<span class='text-primary'>".$cfg_ml->M_Money."</span>，<a class='btn btn-success btn-sm' href='{$GLOBALS['cfg_cmsurl']}/user/buy.php' target='_blank'>前去充值</a>";
$moremsg = "该文档需要<span class='text-primary'>".$needMoney."</span>金币才能浏览，您目前金币<span class='text-primary'>".$cfg_ml->M_Money."</span><a class='btn btn-success btn-sm ml-2' href='{$GLOBALS['cfg_cmsurl']}/user/buy.php' target='_blank'>前去充值</a>";
include_once(DEDETEMPLATE.'/apps/view_msg.htm');
$arc->Close();
exit();
@@ -76,7 +76,7 @@ if ($needMoney > 0 || $needRank > 1) {
}
}
$msgtitle = "扣金币购买阅读";
$moremsg = "该文档需要付费<span class='text-primary'>".$needMoney."</span>金币，您目前金币<span class='text-primary'>".$cfg_ml->M_Money."</span>，<a class='btn btn-success btn-sm' href='{$GLOBALS['cfg_cmsurl']}/apps/view.php?aid=".$aid."&dopost=buy' target='_blank'>确认付点阅读</a>";
$moremsg = "该文档需要付费<span class='text-primary'>".$needMoney."</span>金币，您目前金币<span class='text-primary'>".$cfg_ml->M_Money."</span><a class='btn btn-success btn-sm ml-2' href='{$GLOBALS['cfg_cmsurl']}/apps/view.php?aid=".$aid."&dopost=buy' target='_blank'>确认付点阅读</a>";
include_once($cfg_basedir.$cfg_templets_dir."/apps/view_msg.htm");
$arc->Close();
exit();
@@ -87,6 +87,6 @@ if ($needMoney > 0 || $needRank > 1) {
$arc->Display();
if (DEBUG_LEVEL === TRUE) {
$queryTime = ExecTime() - $t1;
echo "<div style='width:98%;margin:1rem auto;color:#721c24;background-color:#f8d7da;border-color:#f5c6cb;position:relative;padding:.75rem 1.25rem;border:1px solid transparent;border-radius:.25rem'>页面加载总消耗时间：{$queryTime}</div>\r\n";
echo "<div style='position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;width:auto;font-size:14px;color:#721c24;background:#f8d7da;border-color:#f5c6cb;border:1px solid transparent;border-radius:.5rem'>页面加载总消耗时间：{$queryTime}</div>\r\n";
}
?>

+ 1
- 1
src/system/customfields.func.php View File

@@ -68,7 +68,7 @@ function GetFormItem($ctag, $admintype = 'admin')
foreach ($items as $v) {
$v = trim($v);
if ($v != '') {
$myformItem .= ($i == 0 ? "<div class='form-check form-check-inline'><label class='form-check-label'><input type='radio' name='$fieldname' class='form-check-input' value='$v' checked> $v</label></div>" : "<div class='form-check form-check-inline'><label class='form-check-label'><input type='radio' name='$fieldname' class='form-check-input' value='$v'> $v</label></div>");
$myformItem .= ($i == 0 ? "<div class='form-check form-check-inline'><label class='form-check-label'><input type='radio' name='$fieldname' class='form-check-input' value='$v' checked='checked'> $v</label></div>" : "<div class='form-check form-check-inline'><label class='form-check-label'><input type='radio' name='$fieldname' class='form-check-input' value='$v'> $v</label></div>");
$i++;
}
}


+ 1
- 0
src/theme/apps/advancedsearch.htm View File

@@ -8,6 +8,7 @@
<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
</head>
<body>
<main class="container py-3">


+ 1
- 0
src/theme/apps/download_links.htm View File

@@ -8,6 +8,7 @@
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
</head>
<body>
<?php obtaintheme('top.htm');?>


+ 1
- 0
src/theme/apps/flink_add.htm View File

@@ -8,6 +8,7 @@
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
</head>
<body>
<?php obtaintheme('top.htm');?>


+ 1
- 0
src/theme/apps/flink_list.htm View File

@@ -8,6 +8,7 @@
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
</head>
<body>
<?php obtaintheme('top.htm');?>


+ 2
- 1
src/theme/apps/heightsearch.htm View File

@@ -8,6 +8,7 @@
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
</head>
<body>
<?php obtaintheme('top.htm');?>
@@ -79,7 +80,7 @@
<tr>
<td>关键词模式：</td>
<td>
<label><input type="radio" name="kwtype" value="1" checked> 或</label>
<label><input type="radio" name="kwtype" value="1" checked="checked"> 或</label>
<label><input type="radio" name="kwtype" value="0"> 与</label>
</td>
</tr>


+ 1
- 0
src/theme/apps/list_diyform.htm View File

@@ -8,6 +8,7 @@
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
</head>
<body>
<?php obtaintheme('top.htm');?>


+ 1
- 0
src/theme/apps/recommend.htm View File

@@ -8,6 +8,7 @@
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
</head>
<body>
<?php obtaintheme('top.htm');?>


+ 1
- 0
src/theme/apps/showphoto.htm View File

@@ -8,6 +8,7 @@
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
</head>
<body>
<?php obtaintheme('top.htm');?>


+ 1
- 0
src/theme/apps/view_diyform.htm View File

@@ -8,6 +8,7 @@
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
</head>
<body>
<?php obtaintheme('top.htm');?>


+ 1
- 0
src/theme/apps/view_msg.htm View File

@@ -8,6 +8,7 @@
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
</head>
<body>
<?php obtaintheme('top.htm');?>


+ 1
- 0
src/theme/apps/view_msg_catalog.htm View File

@@ -8,6 +8,7 @@
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
</head>
<body>
<?php obtaintheme('top.htm');?>


+ 1
- 0
src/theme/apps/vote.htm View File

@@ -8,6 +8,7 @@
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
</head>
<body>
<?php obtaintheme('top.htm');?>


+ 1
- 0
src/theme/apps/win_templet.htm View File

@@ -8,6 +8,7 @@
<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="../static/web/css/admin.css">
<script src="../static/web/js/jquery.min.js"></script>
</head>
<body>
<table align="center" class="table maintable my-3">


+ 8
- 8
src/user/templets/login.htm View File

@@ -19,27 +19,27 @@
<div class="login-from d-inline-block">
<div class="login-box shadow-sm rounded text-left">
<h2 class="text-center mb-3">会员登录</h2>
<form name='form1' method='POST' action='<?php echo $cfg_memberurl;?>/index_do.php'>
<form name="form1" method="POST" action="<?php echo $cfg_memberurl;?>/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="form-group">
<label for="iptUserid">会员账号</label>
<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入登录会员账号">
<label>会员账号</label>
<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入登录会员账号" required="required">
</div>
<div class="form-group">
<label for="iptPwd">会员密码</label>
<input type="password" name="pwd" id="iptPwd" class="form-control" placeholder="请输入登录会员密码">
<label>会员密码</label>
<input type="password" name="pwd" id="iptPwd" class="form-control" placeholder="请输入登录会员密码" required="required">
</div>
<div class="form-group" id="vdimgck" style="display:none">
<label for="iptValidate">验证码</label>
<div id="vdimgck" class="form-group" style="display:none">
<label>验证码</label>
<div class="input-group">
<input type="text" name="vdcode" id="iptValidate" class="form-control text-uppercase" placeholder="请输入验证码">
<img src="<?php echo $cfg_cmsurl;?>/apps/vdimgck.php" id="validateimg" onclick="this.src='<?php echo $cfg_cmsurl;?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
</div>
</div>
<div class="form-group"><a href="<?php echo $cfg_memberurl;?>/resetpassword.php" class="text-dark">忘记会员密码？</a></div>
<div class="form-group"><a href="<?php echo $cfg_memberurl;?>/resetpassword.php">忘记会员密码？</a></div>
<div class="form-group"><button type="submit" class="btn btn-success btn-md btn-block">登录</button></div>
<div><a href="<?php echo $cfg_memberurl;?>/index_do.php?fmdo=user&dopost=regnew" class="btn btn-outline-success btn-md btn-block">注册</a></div>
</form>


+ 10
- 46
src/user/templets/reg-new.htm View File

@@ -18,32 +18,32 @@
<div class="login-from d-inline-block">
<div class="login-box shadow-sm rounded text-left">
<h2 class="text-center mb-3">会员注册</h2>
<form name="form2" action="reg_new.php" method="post" id="regUser" onsubmit="return CheckSubmit();">
<form name="form2" action="reg_new.php" method="post" id="regUser">
<input type="hidden" name="dopost" value="regbase">
<input type="hidden" name="step" value="1">
<input type="hidden" name="mtype" value="个人">
<input type="hidden" name="pid" value="<?php echo $pid;?>">
<div class="form-group">
<label for="iptUserid">会员账号</label>
<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入会员账号">
<label>会员账号</label>
<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入会员账号" required="required">
</div>
<div class="form-group">
<label for="iptUserpwd">会员密码</label>
<input type="password" name="userpwd" id="iptUserpwd" class="form-control" placeholder="请输入会员密码">
<label>会员密码</label>
<input type="password" name="userpwd" id="iptUserpwd" class="form-control" placeholder="请输入会员密码" required="required">
</div>
<div class="form-group">
<label for="iptUserpwdok">确认会员密码</label>
<input type="password" name="userpwdok" id="iptUserpwdok" class="form-control" placeholder="请输入确认会员密码">
<label>确认会员密码</label>
<input type="password" name="userpwdok" id="iptUserpwdok" class="form-control" placeholder="请输入确认会员密码" required="required">
</div>
<div class="form-group">
<label for="iptValidate">验证码</label>
<label>验证码</label>
<div class="input-group">
<input type="text" name="vdcode" id="iptValidate" class="form-control text-uppercase" placeholder="请输入验证码">
<input type="text" name="vdcode" id="iptValidate" class="form-control text-uppercase" placeholder="请输入验证码" required="required">
<img src="<?php echo $cfg_cmsurl;?>/apps/vdimgck.php" id="validateimg" onClick="this.src='<?php echo $cfg_cmsurl;?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
</div>
</div>
<div class="form-group form-check">
<input type="checkbox" id="iptLicence" class="form-check-input">
<input type="checkbox" id="iptLicence" class="form-check-input" checked="false">
<label class="form-check-label licence" for="iptLicence">我已阅读并接受<a href="">《会员注册条款》</a>和<a href="">《隐私保护条例》</a></label>
</div>
<div class="form-group"><button type="submit" class="btn btn-success btn-md btn-block">注册</button></div>
@@ -55,41 +55,5 @@
</div>
</main>
<?php obtaintheme('foot.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(),
},
];
for (let i = 0; i < formCheck.length; i++) {
const fc = formCheck[i];
if (fc.condition) {
$(fc.elem).addClass("is-invalid");
return false
} else {
$(fc.elem).removeClass("is-invalid");
}
}
return true
}
</script>
</body>
</html>

+ 7
- 38
src/user/templets/resetpassword.htm View File

@@ -21,15 +21,15 @@
<input type="hidden" name="dopost" value="getpwd">
<input type="hidden" name="gourl" value="<?php if (!empty($gourl)) echo $gourl;?>">
<div class="form-group">
<label for="txtUsername">账号</label>
<input type="text" name="userid" id="txtUsername" class="form-control" placeholder="请输入账号">
<label>会员账号</label>
<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入会员账号" required="required">
</div>
<div class="form-group">
<label for="txtMail">邮箱</label>
<input type="text" name="mail" id="txtMail" class="form-control" placeholder="请输入邮箱">
<label>邮箱</label>
<input type="text" name="mail" id="iptMail" class="form-control" placeholder="请输入邮箱" required="required">
</div>
<div class="form-group">
<label for="iptValidate">找回方式</label>
<label>找回方式</label>
<div class="input-group">
<select name="type" class="form-control">
<option value="1" selected>通过邮件取回</option>
@@ -38,9 +38,9 @@
</div>
</div>
<div class="form-group">
<label for="iptValidate">验证码</label>
<label>验证码</label>
<div class="input-group">
<input type="text" name="vdcode" class="form-control text-uppercase" id="iptValidate" placeholder="请输入验证码">
<input type="text" name="vdcode" id="iptValidate" class="form-control text-uppercase" placeholder="请输入验证码" required="required">
<img src="<?php echo $cfg_cmsurl;?>/apps/vdimgck.php" id="validateimg" onclick="this.src='<?php echo $cfg_cmsurl;?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
</div>
</div>
@@ -50,36 +50,5 @@
</div>
</main>
<?php obtaintheme('foot.htm');?>
<script>
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 = "/apps/vdimgck.php?tag=" + num;
}
return false;
}
function hideVc() {
$('#ver_code').css('visibility', 'hidden');
}
$(document).ready(function() {
$("#vdcode").focus(function() {
var leftpos = $("#vdcode").position().left;
$('#ver_code').css('left', leftpos + 'px');
$('#ver_code').css('visibility', 'visible');
});
$("input[type='password']").click(function() {
hideVc()
});
$("#txtUsername").click(function() {
hideVc()
});
$("input[type='radio']").focus(function() {
hideVc()
});
})
</script>
</body>
</html>

+ 12
- 9
src/user/templets/resetpassword2.htm View File

@@ -22,24 +22,27 @@
<input type="hidden" name="setp" value="2">
<input type="hidden" name="id" value="<?php echo $id;?>">
<div class="form-group">
<label>账号</label>
<input type="text" name="userid" readonly="readonly" id="txtUsername" class="form-control" value="<?php echo $row['membername']?>">
<label>会员账号</label>
<input type="text" name="userid" readonly="readonly" id="iptUserid" class="form-control" value="<?php echo $row['membername']?>">
</div>
<?php if (empty($key)) {?>
<div class="form-group">
<label>临时密码</label>
<input type="password" name="pwdtmp" class="form-control" placeholder="请输入临时密码">
<label>会员临时密码</label>
<input type="password" name="pwdtmp" id="iptPwdtmp" class="form-control" placeholder="请输会员临时密码">
</div>
<?php } else {?>
<input name="key" type="hidden" value="<?php echo $key;?>">
<div class="form-group">
<label>验证码</label>
<input name="key" type="hidden" value="<?php echo $key;?>" placeholder="请输入验证码">
</div>
<?php }?>
<div class="form-group">
<label>新密码</label>
<input type="password" name="pwd" class="form-control" placeholder="请输入新密码">
<label>会员新密码</label>
<input type="password" name="pwd" id="iptPwd" class="form-control" placeholder="请输入会员新密码">
</div>
<div class="form-group">
<label>确认密码</label>
<input type="password" name="pwdok" class="form-control" placeholder="请输入确认密码">
<label>会员确认密码</label>
<input type="password" name="pwdok" id="iptPwdok" class="form-control" placeholder="请输入会员确认密码">
</div>
<div><button type="submit" class="btn btn-success btn-md btn-block">下一步</button></div>
</form>


+ 1
- 1
src/user/templets/resetpassword3.htm View File

@@ -26,7 +26,7 @@
</div>
<div class="form-group">
<label>问题答案</label>
<input type="text" name="safeanswer" class="form-control" placeholder="请输入问题答案">
<input type="text" name="safeanswer" id="iptSafeanswer" class="form-control" placeholder="请输入问题答案">
</div>
<div class="form-group">
<label>验证码</label>


Write Preview
Loading…
Cancel
Save