DedeBIZ
/
DedeV6
Bevaka 2
Stjärnmärk 0
Förgrening 0
Kod Pull-förfrågningar 0 Släpp 31 Aktiviteter
Bläddra i källkod

Merge branch 'pagesize' into develop

tags/6.2.0
tianya 3 år sedan
förälder
7c026c95ea eb38cc2b19
incheckning
5ab759a85e
42 ändrade filer med 129 tillägg och 331 borttagningar
Unifierad Vy
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -3
      src/admin/archives_do.php
  2. +1
    -1
      src/admin/file_manage_control.php
  3. +2
    -2
      src/admin/index_body.php
  4. +1
    -1
      src/admin/media_main.php
  5. +1
    -1
      src/admin/sys_data_done.php
  6. +1
    -1
      src/admin/templets/article_add.htm
  7. +1
    -1
      src/admin/templets/file_manage_main.htm
  8. +2
    -6
      src/admin/templets/index.htm
  9. +1
    -1
      src/admin/templets/login.htm
  10. +1
    -1
      src/admin/templets/member_main.htm
  11. +5
    -5
      src/admin/templets/member_scores.htm
  12. +1
    -1
      src/admin/templets/shops_operations.htm
  13. +1
    -1
      src/admin/templets/soft_add.htm
  14. +1
    -1
      src/admin/templets/soft_edit.htm
  15. +1
    -1
      src/admin/templets_one_add.php
  16. +1
    -1
      src/admin/templets_one_edit.php
  17. +59
    -144
      src/install/sql-dfdata.txt
  18. +1
    -1
      src/static/web/css/admin.css
  19. +1
    -1
      src/system/archive/taglist.class.php
  20. +2
    -3
      src/system/common.func.php
  21. +1
    -1
      src/system/common.inc.php
  22. +6
    -6
      src/system/customfields.func.php
  23. +1
    -1
      src/system/database/dedesqlite.class.php
  24. +0
    -9
      src/system/datalistcp.class.php
  25. +1
    -1
      src/system/dedevote.class.php
  26. +1
    -1
      src/system/enums.func.php
  27. +3
    -6
      src/system/helpers/cache.helper.php
  28. +6
    -8
      src/system/libraries/fixtures/headers.php
  29. +1
    -1
      src/system/memberlogin.class.php
  30. +0
    -98
      src/system/sitemap.class.php
  31. +10
    -10
      src/system/taglib/infolink.lib.php
  32. +2
    -2
      src/system/userlogin.class.php
  33. +1
    -1
      src/user/archives_sg_add.php
  34. +1
    -1
      src/user/content_list.php
  35. +1
    -1
      src/user/content_sg_list.php
  36. +1
    -1
      src/user/inc/archives_check.php
  37. +1
    -1
      src/user/mypay.php
  38. +1
    -1
      src/user/mystow.php
  39. +1
    -1
      src/user/operation.php
  40. +1
    -1
      src/user/pm.php
  41. +1
    -1
      src/user/shops_orders.php
  42. +1
    -1
      src/user/shops_products.php

+ 3
- 3
src/admin/archives_do.php Visa fil

@@ -561,9 +561,9 @@ else if ($dopost == 'quickEdit') {
while ($trow = $dsql->GetObject()) { while ($trow = $dsql->GetObject()) {
if ($trow->att == 'j' || $trow->att == 'p') continue; if ($trow->att == 'j' || $trow->att == 'p') continue;
if (preg_match("#".$trow->att."#", $arcRow['flag'])) if (preg_match("#".$trow->att."#", $arcRow['flag']))
echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' checked='checked'>&nbsp;{$trow->attname}{$trow->att}[{$trow->att}]</label>&nbsp;";
echo "<input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' checked='checked'> {$trow->attname}{$trow->att}[{$trow->att}] ";
else else
echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'>&nbsp;{$trow->attname}[{$trow->att}]</label>&nbsp;";
echo "<input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'> {$trow->attname}[{$trow->att}] ";
} }
?> ?>
</td> </td>
@@ -862,7 +862,7 @@ else if ($dopost == 'attsDlg') {
$dsql->Execute(); $dsql->Execute();
while ($trow = $dsql->GetObject()) { while ($trow = $dsql->GetObject()) {
if ($trow->att == 'j' || $trow->att == 'p') continue; if ($trow->att == 'j' || $trow->att == 'p') continue;
echo "<label><input class='np' type='radio' name='flagname' id='flags{$trow->att}' value='{$trow->att}'>&nbsp;{$trow->attname}[{$trow->att}]</label>&nbsp;";
echo "<input class='np' type='radio' name='flagname' id='flags{$trow->att}' value='{$trow->att}'> {$trow->attname}[{$trow->att}] ";
} }
?> ?>
</td> </td>


+ 1
- 1
src/admin/file_manage_control.php Visa fil

@@ -106,7 +106,7 @@ else if ($fmdo == "upload") {
$upfile = ${$upfile}; $upfile = ${$upfile};
$upfile_name = ${$upfile_name}; $upfile_name = ${$upfile_name};
if (is_uploaded_file($upfile)) { if (is_uploaded_file($upfile)) {
// 检查文件类型
//检查文件类型
$mime = get_mime_type($upfile); $mime = get_mime_type($upfile);
if (preg_match("#^unknow#", $mime)) { if (preg_match("#^unknow#", $mime)) {
ShowMsg("系统不支持fileinfo组件，建议php.ini中开启", -1); ShowMsg("系统不支持fileinfo组件，建议php.ini中开启", -1);


+ 2
- 2
src/admin/index_body.php Visa fil

@@ -132,8 +132,8 @@ else if ($dopost == 'setskin') {
)); ));
exit; exit;
} elseif ($dopost == 'safe_mode') { } elseif ($dopost == 'safe_mode') {
$safemsg = "当前系统环境运行模式为【安全模式】，安全模式下将无法使用后台“模板管理”、“标签管理”、“数据库管理”、“模块管理”等功能，如果您需要使用上述功能，可在`/system/common.inc.php`中，将`DEDEBIZ_SAFE_MODE`值更改为`FALSE`";
$unsafemsg = "当前系统环境运行模式为【非安全模式】，系统中“模板管理”、“标签管理”、“数据库管理”、“模块管理”等功能使用不当会存在一定的安全风险，建议您在`/system/common.inc.php`中，将`DEDEBIZ_SAFE_MODE`值更改为`TRUE`";
$safemsg = "当前系统环境运行模式为【安全模式】，安全模式下将无法使用后台“模板管理”、“标签管理”、“数据库管理”、“模块管理”等功能，如果您需要使用上述功能，可在`/system/common.inc.php`中，将`DEDEBIZ_SAFE_MODE`后面值TRUE更改为FALSE";
$unsafemsg = "当前系统环境运行模式为【非安全模式】，系统中“模板管理”、“标签管理”、“数据库管理”、“模块管理”等功能使用不当会存在一定的安全风险，建议您在`/system/common.inc.php`中，将`DEDEBIZ_SAFE_MODE`后面值FALSE更改为TRUE";
$modeStr = DEDEBIZ_SAFE_MODE? $safemsg : $unsafemsg; $modeStr = DEDEBIZ_SAFE_MODE? $safemsg : $unsafemsg;
ShowMsg($modeStr, "javascript:;"); ShowMsg($modeStr, "javascript:;");
exit; exit;


+ 1
- 1
src/admin/media_main.php Visa fil

@@ -18,7 +18,7 @@ if ($dopost == 'filemanager') {
if (file_exists('./file_manage_main.php')) { if (file_exists('./file_manage_main.php')) {
header("location:file_manage_main.php?activepath=$cfg_medias_dir"); header("location:file_manage_main.php?activepath=$cfg_medias_dir");
} else { } else {
ShowMsg("找不到文件管理器，可能已经卸载!", "-1");
ShowMsg("找不到文件管理器，可能已经卸载", "-1");
} }
exit(); exit();
} }


+ 1
- 1
src/admin/sys_data_done.php Visa fil

@@ -257,7 +257,7 @@ else if ($dopost == 'redat') {
function PutInfo($msg1, $msg2) function PutInfo($msg1, $msg2)
{ {
global $cfg_soft_lang; global $cfg_soft_lang;
$msginfo = "<!DOCTYPE html><html><head><meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='IE=Edge,chrome=1'><title>提示信息</title><style>body{margin:0;line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#f8f8f8}a{color:#28a745;text-decoration:none}.tips{margin:70px auto 0;padding:0;width:430px;height:auto;background:#fff;border-radius:.2rem}.tips-head{margin:0 20px;padding:16px 0;border-bottom:1px solid #f8f8f8}.tips-head p{margin:0;padding-left:10px;line-height:16px;text-align:left;border-left:3px solid #dc3545}.tips-box{padding:20px;min-height:120px;color:#424b51}.btn a{display:inline-block;margin:20px auto 0;padding:.375rem .75rem;font-size:12px;color:#fff;background:#28a745;border-radius:.2rem;text-align:center;transition:all .6s}.btn a:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}@media (max-width:768px){body{padding:0 15px}.tips{width:100%}}</style></head><body><center><div class='tips'><div class='tips-head'><p>提示信息</p></div><div class='tips-box'>{$msg1}{$msg2}</div></div>";
$msginfo = "<!DOCTYPE html><html><head><meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='IE=Edge,chrome=1'><title>提示信息</title><style>body{margin:0;line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#f8f8f8}a{color:#28a745;text-decoration:none}.tips{margin:70px auto 0;padding:0;width:430px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.tips-head{margin:0 20px;padding:16px 0;border-bottom:1px solid #f8f8f8}.tips-head p{margin:0;padding-left:10px;line-height:16px;text-align:left;border-left:3px solid #dc3545}.tips-box{padding:20px;min-height:120px;color:#424b51}.btn a{display:inline-block;margin:20px auto 0;padding:.375rem .75rem;font-size:12px;color:#fff;background:#28a745;border-radius:.2rem;text-align:center;transition:all .6s}.btn a:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}@media (max-width:768px){body{padding:0 15px}.tips{width:100%}}</style></head><body><center><div class='tips'><div class='tips-head'><p>提示信息</p></div><div class='tips-box'>{$msg1}{$msg2}</div></div>";
echo $msginfo."</center></body></html>"; echo $msginfo."</center></body></html>";
} }
function RpLine($str) function RpLine($str)


+ 1
- 1
src/admin/templets/article_add.htm Visa fil

@@ -252,7 +252,7 @@ table{border-collapse:separate}
<td> <td>
<label><input name="remote" type="checkbox" class="np" id="remote" value="1" <?php if($cfg_rm_remote=='Y') echo ' checked="1" '; ?>> 下载远程图片和资源</label> <label><input name="remote" type="checkbox" class="np" id="remote" value="1" <?php if($cfg_rm_remote=='Y') echo ' checked="1" '; ?>> 下载远程图片和资源</label>
<label><input name="dellink" type="checkbox" class="np" id="dellink" value="1" <?php if($cfg_arc_dellink=='Y') echo ' checked="1" '; ?>> 删除非站内链接</label> <label><input name="dellink" type="checkbox" class="np" id="dellink" value="1" <?php if($cfg_arc_dellink=='Y') echo ' checked="1" '; ?>> 删除非站内链接</label>
<a href="javascript:OpenMyWin('article_allowurl_edit.php')" class="btn btn-success btn-sm">设置</a>&nbsp;
<a href="javascript:OpenMyWin('article_allowurl_edit.php')" class="btn btn-success btn-sm">设置</a>
<label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" <?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?>> 提取第一个图片为缩略图</label> <label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" <?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?>> 提取第一个图片为缩略图</label>
<label><input type="checkbox" name="needwatermark" value="1" class="np" <?php if($photo_markup=='1') echo "checked"; ?>> 图片是否加水印</label> <label><input type="checkbox" name="needwatermark" value="1" class="np" <?php if($photo_markup=='1') echo "checked"; ?>> 图片是否加水印</label>
</td> </td>


+ 1
- 1
src/admin/templets/file_manage_main.htm Visa fil

@@ -65,7 +65,7 @@ foreach ($dh as $file)
} }
else if(is_dir("$inpath/$file")) else if(is_dir("$inpath/$file"))
{ {
if(preg_match("#^_(.*)$#i",$file)) continue; #屏蔽FrontPage扩展目录和linux隐蔽目录
if(preg_match("#^_(.*)$#i",$file)) continue;
if(preg_match("#^\.(.*)$#i",$file)) continue; if(preg_match("#^\.(.*)$#i",$file)) continue;
$line = "\n<tr onMouseMove=\"javascript:this.bgColor='#F8FCF1';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\"> $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#F8FCF1';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
<td> <td>


+ 2
- 6
src/admin/templets/index.htm Visa fil

@@ -12,10 +12,6 @@
<script src="../static/web/js/jquery.min.js"></script> <script src="../static/web/js/jquery.min.js"></script>
<script src="js/frame.js"></script> <script src="js/frame.js"></script>
<style> <style>
.safemode {
padding: 2px 5px!important;
transform:scale(0.8);
}
#skinlist { #skinlist {
display: block; display: block;
height: 10px; height: 10px;
@@ -92,9 +88,9 @@
<span class="top_dedebiz"><a target="main" href="index_body.php"><?php echo $cfg_webname; ?>系统</a></span> <span class="top_dedebiz"><a target="main" href="index_body.php"><?php echo $cfg_webname; ?>系统</a></span>
<span class="top_version">V<?php echo $cfg_version_detail; ?></span> <span class="top_version">V<?php echo $cfg_version_detail; ?></span>
<?php if(DEDEBIZ_SAFE_MODE) {?> <?php if(DEDEBIZ_SAFE_MODE) {?>
<a target="main" class="btn btn-primary btn-sm safemode" href="index_body.php?dopost=safe_mode">安全</a>
<a target="main" class="btn btn-primary btn-sm" href="index_body.php?dopost=safe_mode">安全</a>
<?php } else {?> <?php } else {?>
<a target="main" class="btn btn-warning btn-sm safemode" href="index_body.php?dopost=safe_mode">非安全</a>
<a target="main" class="btn btn-warning btn-sm" href="index_body.php?dopost=safe_mode">非安全</a>
<?php }?> <?php }?>
</div> </div>
<div class="top_link"> <div class="top_link">


+ 1
- 1
src/admin/templets/login.htm Visa fil

@@ -81,7 +81,7 @@
</header> </header>
<main class="container login-from mt-5"> <main class="container login-from mt-5">
<?php echo $redmsg; ?> <?php echo $redmsg; ?>
<div class="login-area">
<div class="login-area shadow-sm">
<h4 class="mb-4 text-center">后台登录</h4> <h4 class="mb-4 text-center">后台登录</h4>
<form name="form1" method="post" action="login.php"> <form name="form1" method="post" action="login.php">
<input type="hidden" name="gotopage" value="<?php if(!empty($gotopage)) echo RemoveXSS($gotopage); ?>"> <input type="hidden" name="gotopage" value="<?php if(!empty($gotopage)) echo RemoveXSS($gotopage); ?>">


+ 1
- 1
src/admin/templets/member_main.htm Visa fil

@@ -73,7 +73,7 @@
</table> </table>
</td> </td>
</tr> </tr>
<tr bgcolor="#f8f8f8" align="center">
<tr bgcolor="#F8FCF1" align="center">
<td width="6%">选择</td> <td width="6%">选择</td>
<td width="6%">mid</td> <td width="6%">mid</td>
<td width="10%">登录名</td> <td width="10%">登录名</td>


+ 5
- 5
src/admin/templets/member_scores.htm Visa fil

@@ -31,11 +31,11 @@
</table> </table>
<table width="98%" cellpadding="1" cellspacing="1" align="center" class="table maintable"> <table width="98%" cellpadding="1" cellspacing="1" align="center" class="table maintable">
<tr> <tr>
<td width="6%" align="center" valign="middle" bgcolor="#f8f8f8"><input type="checkbox" name="chkall" id="chkall" onClick="CheckAll(this.form)" class='np'> 删</td>
<td width="23%" align="center" bgcolor="#f8f8f8">积分大于</td>
<td width="30%" align="center" bgcolor="#f8f8f8">星星数</td>
<td width="23%" align="center" bgcolor="#f8f8f8">级别头衔</td>
<td width="30%" align="center" bgcolor="#f8f8f8">是否默认</td>
<td width="6%" align="center" bgcolor="#F8FCF1"><input type="checkbox" name="chkall" id="chkall" onClick="CheckAll(this.form)" class='np'> 删</td>
<td width="23%" align="center" bgcolor="#F8FCF1">积分大于</td>
<td width="30%" align="center" bgcolor="#F8FCF1">星星数</td>
<td width="23%" align="center" bgcolor="#F8FCF1">级别头衔</td>
<td width="30%" align="center" bgcolor="#F8FCF1">是否默认</td>
</tr> </tr>
<?php <?php
foreach($Scores as $v){ foreach($Scores as $v){


+ 1
- 1
src/admin/templets/shops_operations.htm Visa fil

@@ -135,7 +135,7 @@
{/dede:datalist} {/dede:datalist}
</form> </form>
<tr> <tr>
<td colspan="11" bgcolor="#f8f8f8" style="padding-top:10px">&nbsp;
<td bgcolor="#f8f8f8" colspan="11">
<button type="button" onClick="ReSel();" class="btn btn-success btn-sm">反选</button> <button type="button" onClick="ReSel();" class="btn btn-success btn-sm">反选</button>
<button type="button" onClick="DelSel();" class="btn btn-danger btn-sm">删除</button> <button type="button" onClick="DelSel();" class="btn btn-danger btn-sm">删除</button>
<button type="button" onClick="UpSel();" class="btn btn-success btn-sm">设为已付款状态</button> <button type="button" onClick="UpSel();" class="btn btn-success btn-sm">设为已付款状态</button>


+ 1
- 1
src/admin/templets/soft_add.htm Visa fil

@@ -441,7 +441,7 @@ table{border-collapse:separate}
<td width="90">&nbsp;附加选项：</td> <td width="90">&nbsp;附加选项：</td>
<td> <td>
<label><input name="remote" type="checkbox" class="np" id="remote" value="1" <?php if($cfg_rm_remote=='Y') echo ' checked'; ?>> 下载远程图片和资源</label> <label><input name="remote" type="checkbox" class="np" id="remote" value="1" <?php if($cfg_rm_remote=='Y') echo ' checked'; ?>> 下载远程图片和资源</label>
<label><input name="dellink" type="checkbox" class="np" id="dellink" value="1" <?php if($cfg_arc_dellink=='Y') echo ' checked'; ?>> ;删除非站内链接</label>
<label><input name="dellink" type="checkbox" class="np" id="dellink" value="1" <?php if($cfg_arc_dellink=='Y') echo ' checked'; ?>> 删除非站内链接</label>
<a href="javascript:OpenMyWin('article_allowurl_edit.php');" class="btn btn-success btn-sm">设置</a> <a href="javascript:OpenMyWin('article_allowurl_edit.php');" class="btn btn-success btn-sm">设置</a>
<label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" <?php if($cfg_arc_autopic=='Y') echo ' checked'; ?>> 提取第一个图片为缩略图</label> <label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" <?php if($cfg_arc_autopic=='Y') echo ' checked'; ?>> 提取第一个图片为缩略图</label>
</td> </td>


+ 1
- 1
src/admin/templets/soft_edit.htm Visa fil

@@ -387,7 +387,7 @@ table{border-collapse:separate}
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="4" bgcolor="#F1F5F2" class="bline">
<td colspan="4" class="bline">
<table width="900" cellspacing="0" cellpadding="0"> <table width="900" cellspacing="0" cellpadding="0">
<tr> <tr>
<td width="90">&nbsp;附加选项：</td> <td width="90">&nbsp;附加选项：</td>


+ 1
- 1
src/admin/templets_one_add.php Visa fil

@@ -16,7 +16,7 @@ if ($dopost == "save") {
$uptime = time(); $uptime = time();
$body = str_replace('&quot;', '\\"', $body); $body = str_replace('&quot;', '\\"', $body);
$filename = preg_replace("#^\/#", "", $nfilename); $filename = preg_replace("#^\/#", "", $nfilename);
if (DEDEBIZ_SAFE_MODE) $ismake = 0; // 安全模式不允许编译
if (DEDEBIZ_SAFE_MODE) $ismake = 0; //安全模式不允许编译
if (!preg_match('#\.htm$#i', trim($template))) { if (!preg_match('#\.htm$#i', trim($template))) {
ShowMsg("您指定的文件名被系统禁止", "javascript:;"); ShowMsg("您指定的文件名被系统禁止", "javascript:;");
exit(); exit();


+ 1
- 1
src/admin/templets_one_edit.php Visa fil

@@ -17,7 +17,7 @@ if ($dopost == "saveedit") {
$uptime = time(); $uptime = time();
$body = str_replace('&quot;', '\\"', $body); $body = str_replace('&quot;', '\\"', $body);
$filename = preg_replace("#^\/#", "", $nfilename); $filename = preg_replace("#^\/#", "", $nfilename);
if (DEDEBIZ_SAFE_MODE) $ismake = 0; // 安全模式不允许编译
if (DEDEBIZ_SAFE_MODE) $ismake = 0; //安全模式不允许编译
if (!preg_match('#\.htm$#i', trim($template))) { if (!preg_match('#\.htm$#i', trim($template))) {
ShowMsg("您指定的文件名被系统禁止", "javascript:;"); ShowMsg("您指定的文件名被系统禁止", "javascript:;");
exit(); exit();


+ 59
- 144
src/install/sql-dfdata.txt Visa fil

@@ -3947,62 +3947,63 @@ INSERT INTO `#@__sysconfig` VALUES('1','cfg_basehost','站点网址','1','string
('4','cfg_indexurl','主页链接','1','string','/'), ('4','cfg_indexurl','主页链接','1','string','/'),
('5','cfg_backup_dir','数据备份目录，存data文件夹里','2','string','backupdata'), ('5','cfg_backup_dir','数据备份目录，存data文件夹里','2','string','backupdata'),
('6','cfg_indexname','主页链接名','1','string','网站主页'), ('6','cfg_indexname','主页链接名','1','string','网站主页'),
('7','cfg_webname','网站名称','1','string','某某公司'),
('8','cfg_adminemail','网站发信邮箱','2','string','support@dedebiz.com'),
('9','cfg_html_editor','富文本，默认CKEditor可自行更换其它富文本','2','string','ckeditor'),
('10','cfg_arcdir','默认文档生成文件路径','1','string','/a'),
('11','cfg_medias_dir','默认图片上传文件路径','1','string','/static'),
('12','cfg_ddimg_width','缩略图默认宽度','3','number','400'),
('13','cfg_ddimg_height','缩略图默认高度','3','number','300'),
('14','cfg_album_width','图集默认显示图片的大小','3','number','800'),
('15','cfg_imgtype','图片浏览器文件类型','3','string','jpg|gif|png|webp|bmp'),
('16','cfg_softtype','允许上传的软件类型','3','bstring','zip|gz|rar|iso|doc|xsl|ppt|wps'),
('17','cfg_mediatype','允许的多媒体文件类型','3','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov'),
('18','cfg_specnote','专题的最大节点数','2','number','10'),
('19','cfg_list_symbol','栏目位置的间隔符号','2','string',''),
('20','cfg_notallowstr','系统禁用词语，用“|”分开，但不要在结尾加“|”','5','bstring','神经病|废物'),
('21','cfg_feedbackcheck','是否需审核评论及留言','5','bool','Y'),
('22','cfg_keyword_replace','是否使用关键词替换功能，开启影响文档生成速度','2','bool','Y'),
('23','cfg_rewrite','是否使用伪静态，开启需添加伪静态规则','1','bool','N'),
('24','cfg_df_style','网站模板默认风格','1','string','templets'),
('25','cfg_multi_site','是否支持多站点，开启此项后附件栏目连接arclist内容启用绝对网址','2','bool','N'),
('26','cfg_rm_remote','远程图片本地化','7','bool','Y'),
('27','cfg_dede_log','是否开启管理日志','2','bool','N'),
('28','cfg_powerby','网站版权信息','1','bstring','Copyright © 2022 DedeBIZ 版权所有'),
('29','cfg_jump_once','跳转网址是否直接跳转否则显示中转页','7','bool','Y'),
('30','cfg_task_pwd','系统计划任务客户端许可密码，需要客户端，通常不会太重要','7','string',''),
('31','cfg_arcsptitle','是否开启分页标题，开启影响文档生成速度','6','bool','N'),
('32','cfg_arcautosp','是否开启长文章自动分页','6','bool','N'),
('33','cfg_arcautosp_size','文章自动分页大小','6','number','5'),
('34','cfg_auot_description','自动摘要长度（0-250，0表示不启用）','7','number','250'),
('35','cfg_ftp_host','FTP主机','2','string',''),
('36','cfg_ftp_port','FTP端口','2','number',''),
('37','cfg_ftp_user','FTP用户名','2','string',''),
('38','cfg_ftp_pwd','FTP密码','2','string',''),
('39','cfg_ftp_root','网站根在FTP中的目录','2','string','/'),
('40','cfg_ftp_mkdir','是否强制用FTP创建目录','2','bool','N'),
('41','cfg_list_son','是否包含上级列表子类内容','6','bool','Y'),
('42','cfg_mb_open','是否开启会员功能','4','bool','N'),
('43','cfg_mb_album','是否开启会员图集功能','4','bool','Y'),
('44','cfg_mb_upload','是否允许会员上传非图片附件','4','bool','Y'),
('45','cfg_mb_upload_size','会员上传文件大小：KB','4','number','1024'),
('46','cfg_mb_sendall','是否开放会员对自定义模型投稿','4','bool','Y'),
('47','cfg_mb_rmdown','是否会员指定远程文档下载到本地','4','bool','Y'),
('48','cfg_cli_time','服务器时区设置','2','number','8'),
('49','cfg_mb_addontype','会员附件许可的类型','4','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov|zip|rar|doc|xsl|ppt|wps'),
('50','cfg_mb_max','会员附件总大小限制：MB','4','number','500'),
('51','cfg_replacestr','替换词语，词语会被替换成*用“|”分开，但不要在结尾加“|”','5','bstring','他妈的|傻逼'),
('52','cfg_makeindex','发布文章后马上更新网站主页','6','bool','N'),
('53','cfg_keyword_like','使用关键词关连文章','6','bool','Y'),
('54','cfg_index_max','首页调用函数最大索引文档数，不适用于经常单栏目采集过多内容网站，不启用本项此值设置为0即可','6','number','10000'),
('55','cfg_index_cache','arclist标签调用缓存（0不启用，大于0值为多少秒）','6','number','86400'),
('56','cfg_tplcache','是否启用模板缓存','6','bool','Y'),
('57','cfg_tplcache_dir','模板缓存目录','6','string','/data/tplcache'),
('58','cfg_makesign_cache','是否修改发布单个文档调用缓存','6','bool','N'),
('59','cfg_arc_dellink','删除非站内链接','7','bool','Y'),
('60','cfg_arc_autopic','提取第一张图片作为缩略图','7','bool','Y'),
('61','cfg_arc_autokeyword','自动提取关键词','7','bool','N'),
('62','cfg_title_maxlen','文档标题最大长度，变量后需要手工修改数据表','7','number','250'),
('7','cfg_indexseo','主页SEO标题','1','string',''),
('8','cfg_webname','网站名称','1','string','某某公司'),
('9','cfg_adminemail','网站发信邮箱','2','string','support@dedebiz.com'),
('10','cfg_html_editor','富文本，默认CKEditor可自行更换其它富文本','2','string','ckeditor'),
('11','cfg_arcdir','默认文档生成文件路径','1','string','/a'),
('12','cfg_medias_dir','默认图片上传文件路径','1','string','/static'),
('13','cfg_ddimg_width','缩略图默认宽度','3','number','400'),
('14','cfg_ddimg_height','缩略图默认高度','3','number','300'),
('15','cfg_album_width','图集默认显示图片的大小','3','number','800'),
('16','cfg_imgtype','图片浏览器文件类型','3','string','jpg|gif|png|webp|bmp'),
('17','cfg_softtype','允许上传的软件类型','3','bstring','zip|gz|rar|iso|doc|xsl|ppt|wps'),
('18','cfg_mediatype','允许的多媒体文件类型','3','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov'),
('19','cfg_specnote','专题的最大节点数','2','number','10'),
('20','cfg_list_symbol','栏目位置的间隔符号','2','string',''),
('21','cfg_notallowstr','系统禁用词语，用“|”分开，但不要在结尾加“|”','5','bstring','神经病|废物'),
('22','cfg_feedbackcheck','是否需审核评论及留言','5','bool','Y'),
('23','cfg_keyword_replace','是否使用关键词替换功能，开启影响文档生成速度','2','bool','Y'),
('24','cfg_rewrite','是否使用伪静态，开启需添加伪静态规则','1','bool','N'),
('25','cfg_df_style','网站模板默认风格','1','string','templets'),
('26','cfg_multi_site','是否支持多站点，开启此项后附件栏目连接arclist内容启用绝对网址','2','bool','N'),
('27','cfg_rm_remote','远程图片本地化','7','bool','Y'),
('28','cfg_dede_log','是否开启管理日志','2','bool','N'),
('29','cfg_powerby','网站版权信息','1','bstring','Copyright © 2022 DedeBIZ 版权所有'),
('30','cfg_jump_once','跳转网址是否直接跳转否则显示中转页','7','bool','Y'),
('31','cfg_task_pwd','系统计划任务客户端许可密码，需要客户端，通常不会太重要','7','string',''),
('32','cfg_arcsptitle','是否开启分页标题，开启影响文档生成速度','6','bool','N'),
('33','cfg_arcautosp','是否开启长文章自动分页','6','bool','N'),
('34','cfg_arcautosp_size','文章自动分页大小','6','number','5'),
('35','cfg_auot_description','自动摘要长度（0-250，0表示不启用）','7','number','250'),
('36','cfg_ftp_host','FTP主机','2','string',''),
('37','cfg_ftp_port','FTP端口','2','number',''),
('38','cfg_ftp_user','FTP用户名','2','string',''),
('39','cfg_ftp_pwd','FTP密码','2','string',''),
('40','cfg_ftp_root','网站根在FTP中的目录','2','string','/'),
('41','cfg_ftp_mkdir','是否强制用FTP创建目录','2','bool','N'),
('42','cfg_list_son','是否包含上级列表子类内容','6','bool','Y'),
('43','cfg_mb_open','是否开启会员功能','4','bool','N'),
('44','cfg_mb_album','是否开启会员图集功能','4','bool','Y'),
('45','cfg_mb_upload','是否允许会员上传非图片附件','4','bool','Y'),
('46','cfg_mb_upload_size','会员上传文件大小：KB','4','number','1024'),
('47','cfg_mb_sendall','是否开放会员对自定义模型投稿','4','bool','Y'),
('48','cfg_mb_rmdown','是否会员指定远程文档下载到本地','4','bool','Y'),
('49','cfg_cli_time','服务器时区设置','2','number','8'),
('50','cfg_mb_addontype','会员附件许可的类型','4','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov|zip|rar|doc|xsl|ppt|wps'),
('51','cfg_mb_max','会员附件总大小限制：MB','4','number','500'),
('52','cfg_replacestr','替换词语，词语会被替换成*用“|”分开，但不要在结尾加“|”','5','bstring','他妈的|傻逼'),
('53','cfg_makeindex','发布文章后马上更新网站主页','6','bool','N'),
('54','cfg_keyword_like','使用关键词关连文章','6','bool','Y'),
('55','cfg_index_max','首页调用函数最大索引文档数，不适用于经常单栏目采集过多内容网站，不启用本项此值设置为0即可','6','number','10000'),
('56','cfg_index_cache','arclist标签调用缓存（0不启用，大于0值为多少秒）','6','number','86400'),
('57','cfg_tplcache','是否启用模板缓存','6','bool','Y'),
('58','cfg_tplcache_dir','模板缓存目录','6','string','/data/tplcache'),
('59','cfg_makesign_cache','是否修改发布单个文档调用缓存','6','bool','N'),
('60','cfg_arc_dellink','删除非站内链接','7','bool','Y'),
('61','cfg_arc_autopic','提取第一张图片作为缩略图','7','bool','Y'),
('62','cfg_arc_autokeyword','自动提取关键词','7','bool','N'),
('63','cfg_title_maxlen','文档标题最大长度，变量后需要手工修改数据表','7','number','250'),
('64','cfg_album_row','图集多行多列样式默认行数','3','number','3'), ('64','cfg_album_row','图集多行多列样式默认行数','3','number','3'),
('65','cfg_album_col','图集多行多列样式默认列数','3','number','4'), ('65','cfg_album_col','图集多行多列样式默认列数','3','number','4'),
('66','cfg_album_pagesize','图集多页多图每页显示最大数','3','number','12'), ('66','cfg_album_pagesize','图集多页多图每页显示最大数','3','number','12'),
@@ -4043,8 +4044,8 @@ INSERT INTO `#@__sysconfig` VALUES('1','cfg_basehost','站点网址','1','string
('102','cfg_fck_xhtml','是否使用富文本','2','bool','N'), ('102','cfg_fck_xhtml','是否使用富文本','2','bool','N'),
('103','cfg_allsearch_limit','网站全局搜索时间限制：秒','2','string','1'), ('103','cfg_allsearch_limit','网站全局搜索时间限制：秒','2','string','1'),
('104','cfg_delete','是否开启文章回收站','2','bool','Y'), ('104','cfg_delete','是否开启文章回收站','2','bool','Y'),
('105','cfg_keywords','站点默认关键词','1','string',''),
('106','cfg_description','站点描述','1','bstring',''),
('105','cfg_keywords','主页关键词','1','string',''),
('106','cfg_description','主页描述','1','bstring',''),
('107','cfg_beian','网站备案号','1','string',''), ('107','cfg_beian','网站备案号','1','string',''),
('108','cfg_need_typeid2','是否启用副栏目','6','bool','Y'), ('108','cfg_need_typeid2','是否启用副栏目','6','bool','Y'),
('109','cfg_mb_pwdtype','前台密码验证类型：默认32—32位md5，可选：l16—前16位、r16—后16位、m16—中间16位','4','string','32'), ('109','cfg_mb_pwdtype','前台密码验证类型：默认32—32位md5，可选：l16—前16位、r16—后16位、m16—中间16位','4','string','32'),
@@ -4090,92 +4091,6 @@ INSERT INTO `#@__sysconfig` VALUES('1','cfg_basehost','站点网址','1','string
('149', 'cfg_bizcore_appid', 'DedeBIZ Core应用ID', 1, 'string', ''), ('149', 'cfg_bizcore_appid', 'DedeBIZ Core应用ID', 1, 'string', ''),
('150', 'cfg_bizcore_key', 'DedeBIZ Core通信密钥', 1, 'string', ''), ('150', 'cfg_bizcore_key', 'DedeBIZ Core通信密钥', 1, 'string', ''),
('151', 'cfg_tags_dir', 'TAGS生成目录', 7, 'string', '{cmspath}/a/tags'); ('151', 'cfg_tags_dir', 'TAGS生成目录', 7, 'string', '{cmspath}/a/tags');
('63','cfg_album_row','图集多行多列样式默认行数','3','number','3'),
('64','cfg_album_col','图集多行多列样式默认列数','3','number','4'),
('65','cfg_album_pagesize','图集多页多图每页显示最大数','3','number','12'),
('66','cfg_album_style','图集默认样式（1为多页多图、2为多页单图、3为缩略图列表）','3','number','2'),
('67','cfg_album_ddwidth','图集默认缩略图大小','3','number','200'),
('68','cfg_mb_notallow','不允许注册的会员ID','4','bstring','www,bbs,ftp,mail,user,users,admin,administrator'),
('69','cfg_mb_idmin','用户ID最小长度','4','number','6'),
('70','cfg_mb_pwdmin','用户密码最小长度','4','number','6'),
('71','cfg_md_idurl','是否严格限定会员登录ID，允许会员使用二级域名必须设置此项','4','bool','N'),
('72','cfg_mb_rank','注册会员默认级别，会员权限管理中查看级别代表的数字','4','number','10'),
('73','cfg_feedback_time','两次评论至少间隔时间：秒','5','number','30'),
('74','cfg_feedback_numip','每个IP一小时内最大评论数','5','number','30'),
('75','cfg_md_mailtest','是否限制邮箱只能注册一个帐号','4','bool','Y'),
('76','cfg_mb_spacesta','会员使用权限开通状态（-10邮件验证、-1手工审核、0没限制）','4','number','-10'),
('77','cfg_mb_allowreg','是否允许新会员注册','4','bool','Y'),
('78','cfg_mb_adminlock','是否禁止访问管理员帐号的空间','4','bool','N'),
('80','cfg_mb_cktitle','是否检测会员投稿重复标题','5','bool','Y'),
('81','cfg_mb_editday','投稿多少天后不能再修改','5','number','1'),
('82','cfg_sendarc_scores','投稿可获取积分','5','number','10'),
('83','cfg_caicai_sub','被踩扣除文章好评度','5','number','2'),
('84','cfg_caicai_add','被顶扣除文章好评度','5','number','2'),
('85','cfg_feedback_add','详细好评可获好评度','5','number','5'),
('86','cfg_feedback_sub','详细恶评扣除好评度','5','number','5'),
('87','cfg_sendfb_scores','参与评论可获积分','5','number','3'),
('88','cfg_search_max','最大搜索检查文档数','6','number','50000'),
('89','cfg_search_maxrc','最大返回搜索结果数','6','number','300'),
('90','cfg_search_time','搜索间隔时间：秒','6','number','3'),
('91','cfg_smtp_port','SMTP服务器端口','2','string','25'),
('92','cfg_sendmail_bysmtp','是否启用SMTP方式发送邮件','2','bool','Y'),
('93','cfg_smtp_server','SMTP服务器','2','string','smtp.qq.com'),
('94','cfg_smtp_usermail','SMTP服务器的用户邮箱','2','string','tianya@dedebiz.com'),
('95','cfg_smtp_user','SMTP服务器的用户帐号','2','string','tianya'),
('96','cfg_smtp_password','SMTP服务器的用户密码','2','string','tianya'),
('97','cfg_updateperi','百度新闻更新时间：分','8','string','15'),
('98','cfg_online_type','在线支付网关类型','2','string','nps'),
('99','cfg_upload_switch','删除文章同时删除相关附件文件','2','bool','Y'),
('100','cfg_fck_xhtml','是否使用富文本','2','bool','N'),
('101','cfg_allsearch_limit','网站全局搜索时间限制：秒','2','string','1'),
('102','cfg_delete','是否开启文章回收站','2','bool','Y'),
('103','cfg_keywords','站点默认关键词','1','string',''),
('104','cfg_description','站点描述','1','bstring',''),
('105','cfg_beian','网站备案号','1','string',''),
('106','cfg_need_typeid2','是否启用副栏目','6','bool','Y'),
('107','cfg_mb_pwdtype','前台密码验证类型，默认32—32位md5（l16—前16位、r16—后16位、m16—中间16位）','4','string','32'),
('108','cfg_cache_type','id 文档ID，content标签最终内容，修改此变量后必须更新系统缓存','6','string','id'),
('109','cfg_max_face','会员上传头像大小限制KB','3','number','100'),
('110','cfg_typedir_df','栏目网址使用目录名（不显示默认页，则/a/b/c形式）','2','bool','Y'),
('111','cfg_make_andcat','发表文章后马上更新相关栏目','6','bool','N'),
('112','cfg_make_prenext','发表文章后马上更新上下篇','6','bool','N'),
('113','cfg_feedback_forbid','是否禁止所有评论，包括禁止顶踩等','5','bool','N'),
('114','cfg_addon_domainbind','是否绑定附件目录为指定的二级域名','7','bool','N'),
('115','cfg_addon_domain','附件目录的二级域名','7','string',''),
('116','cfg_df_dutyadmin','默认责任编辑名称','7','string','管理员'),
('118','cfg_mb_allowncarc','是否允许用户空间显示未审核文章','4','bool','Y'),
('119','cfg_mb_spaceallarc','会员空间中所有文档的频道ID（不限为0）','4','number','0'),
('120','cfg_face_adds','上传头像增加积分','5','number','10'),
('121','cfg_moreinfo_adds','填写详细资料增加积分','5','number','20'),
('122','cfg_money_scores','多少积分可以兑换一个金币','5','number','50'),
('123','cfg_mb_wnameone','是否允许用户昵称重复','4','bool','N'),
('124','cfg_arc_dirname','是否允许用目录作为文档文件名，文档命名规则：{typedir}/{aid}/index.html','7','bool','Y'),
('125','cfg_puccache_time','需缓存内容全局缓存时间：秒','6','number','36000'),
('126','cfg_arc_click','文档默认点击数（-1表示随机50-200）','7','number','-1'),
('127','cfg_addon_savetype','附件保存形式，按data函数日期参数（y年m月d日）','3','string','ymd'),
('128','cfg_qk_uploadlit','异步上传缩略图，空间太不稳定用户关闭此项','3','bool','Y'),
('129','cfg_login_adds','登录会员中心获积分','5','number','2'),
('130','cfg_userad_adds','会员推广获积分','5','number','10'),
('131','cfg_ddimg_full','是否使用缩略图强制大小，对背景填充','3','bool','N'),
('132','cfg_ddimg_bgcolor','缩略图空白背景填充颜色（0白，1黑）','3','number','0'),
('133','cfg_replace_num','文档内容关键词替换次数（0为全部替换）','7','number','1'),
('134','cfg_uplitpic_cut','是否上传缩略图后马上弹出裁剪框','3','bool','Y'),
('135','cfg_album_mark','是否使用图集水印，小图也会受影响','3','bool','N'),
('136','cfg_mb_feedcheck','是否需要会员动态审核','4','bool','N'),
('137','cfg_mb_msgischeck','是否需要会员状态审核','4','bool','N'),
('138','cfg_title_site','是否发布和编辑文档时远程发布，启用远程站点的前提下','2','bool','N'),
('139','cfg_mysql_type','数据库类型，支持MySQL和Mysqli','2','string','mysql'),
('140', 'cfg_domain_cookie', '跨域共享Cookie的域名，例如: www.dedebiz.com', 2, 'string', ''),
('141', 'cfg_cross_sectypeid', '支持交叉栏目显示副栏目内容', '7', 'bool', 'Y'),
('142', 'cfg_digg_update', '顶踩缓存异步更新间隔（0为不缓存）', '6', 'number', '0'),
('143', 'cfg_feedback_guest', '是否允许匿名评论', '5', 'bool', 'N'),
('144', 'cfg_feedback_msglen', '评论内容字数限定', 5, 'number', '250'),
('145', 'cfg_auth_code', '商业版授权码', 1, 'bstring', ''),
('146', 'cfg_bizcore_hostname', 'DedeBIZ Core地址', 1, 'string', '127.0.0.1'),
('147', 'cfg_bizcore_port', 'DedeBIZ Core端口', 1, 'number', '8181'),
('148', 'cfg_bizcore_appid', 'DedeBIZ Core应用ID', 1, 'string', ''),
('149', 'cfg_bizcore_key', 'DedeBIZ Core通信密钥', 1, 'string', ''),
('150', 'cfg_tags_dir', 'TAGS生成目录', 7, 'string', '{cmspath}/a/tags');
INSERT INTO `#@__sys_module` VALUES(1, '1f35620fb42d452fa2bdc1dee1690f92', '文件管理器', '', '', 0, ''), INSERT INTO `#@__sys_module` VALUES(1, '1f35620fb42d452fa2bdc1dee1690f92', '文件管理器', '', '', 0, ''),
(2, 'b437d85a7a7bc778c9c79b5ec36ab9aa', '友情链接', '', '', 0, ''), (2, 'b437d85a7a7bc778c9c79b5ec36ab9aa', '友情链接', '', '', 0, ''),


+ 1
- 1
src/static/web/css/admin.css
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 1
- 1
src/system/archive/taglist.class.php Visa fil

@@ -171,7 +171,7 @@ class TagList
$this->ParseDMFields($this->PageNo, 0); $this->ParseDMFields($this->PageNo, 0);
} }
$this->dtp->Display(); $this->dtp->Display();
// $this->Close();
//$this->Close();
} }
/** /**
* 解析模板，对固定的标记进行初始给值 * 解析模板，对固定的标记进行初始给值


+ 2
- 3
src/system/common.func.php Visa fil

@@ -19,7 +19,7 @@ define('ALERT_COLORS', array(
ALERT_LIGHT => array('#fefefe','#fdfdfe','#636464'), ALERT_LIGHT => array('#fefefe','#fdfdfe','#636464'),
ALERT_DARK => array('#d3d3d4','#bcbebf','#141619'), ALERT_DARK => array('#d3d3d4','#bcbebf','#141619'),
)); ));
define("ALERT_TPL", '<div style="width: 98%;margin: 0 auto;"><div style="font-size:12px;margin:1rem auto;color:~color~;background:~background~;border-color:~border~;position:relative;padding:.75rem 1.25rem;border:1px solid transparent;border-radius:.2rem">~content~</div></div>');
define("ALERT_TPL", '<div style="width:98%;margin:0 auto"><div style="font-size:12px;margin:1rem auto;color:~color~;background:~background~;border-color:~border~;position:relative;padding:.75rem 1.25rem;border:1px solid transparent;border-radius:.2rem">~content~</div></div>');
//$content:内容 $type:alert类型 //$content:内容 $type:alert类型
function DedeAlert($content, $type = ALERT_PRIMARY) function DedeAlert($content, $type = ALERT_PRIMARY)
{ {
@@ -92,7 +92,6 @@ function get_mime_type($filename)
if (!function_exists('finfo_open')) { if (!function_exists('finfo_open')) {
return 'unknow/octet-stream'; return 'unknow/octet-stream';
} }

$finfo = finfo_open(FILEINFO_MIME_TYPE); $finfo = finfo_open(FILEINFO_MIME_TYPE);
$mimeType = finfo_file($finfo, $filename); $mimeType = finfo_file($finfo, $filename);
finfo_close($finfo); finfo_close($finfo);
@@ -259,7 +258,7 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
} }
$func .= "var pgo=0;function JumpUrl(){if (pgo==0){location='$gourl'; pgo=1;}}"; $func .= "var pgo=0;function JumpUrl(){if (pgo==0){location='$gourl'; pgo=1;}}";
$rmsg = $func; $rmsg = $func;
$rmsg .= "document.write(\"<style>body{margin:0;line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#f8f8f8}a{color:#28a745;text-decoration:none}.tips{margin:70px auto 0;padding:0;width:430px;height:auto;background:#fff;border-radius:.2rem}.tips-head{margin:0 20px;padding:16px 0;border-bottom:1px solid #f8f8f8}.tips-head p{margin:0;padding-left:10px;line-height:16px;text-align:left;border-left:3px solid #dc3545}.tips-box{padding:20px;min-height:120px;color:#424b51}.btn a{display:inline-block;margin:20px auto 0;padding:.375rem .75rem;font-size:12px;color:#fff;background:#28a745;border-radius:.2rem;text-align:center;transition:all .6s}.btn a:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}@media (max-width:768px){body{padding:0 15px}.tips{width:100%}}</style>\");";
$rmsg .= "document.write(\"<style>body{margin:0;line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#f8f8f8}a{color:#28a745;text-decoration:none}.tips{margin:70px auto 0;padding:0;width:430px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.tips-head{margin:0 20px;padding:16px 0;border-bottom:1px solid #f8f8f8}.tips-head p{margin:0;padding-left:10px;line-height:16px;text-align:left;border-left:3px solid #dc3545}.tips-box{padding:20px;min-height:120px;color:#424b51}.btn a{display:inline-block;margin:20px auto 0;padding:.375rem .75rem;font-size:12px;color:#fff;background:#28a745;border-radius:.2rem;text-align:center;transition:all .6s}.btn a:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}@media (max-width:768px){body{padding:0 15px}.tips{width:100%}}</style>\");";
$rmsg .= "document.write(\"<div class='tips'>"; $rmsg .= "document.write(\"<div class='tips'>";
$rmsg .= "<div class='tips-head'><p>提示信息</p></div>\");"; $rmsg .= "<div class='tips-head'><p>提示信息</p></div>\");";
$rmsg .= "document.write(\"<div class='tips-box'>\");"; $rmsg .= "document.write(\"<div class='tips-box'>\");";


+ 1
- 1
src/system/common.inc.php Visa fil

@@ -6,7 +6,7 @@
* @license https://www.dedebiz.com/license * @license https://www.dedebiz.com/license
* @link https://www.dedebiz.com * @link https://www.dedebiz.com
*/ */
// V6安全模式，如果启用安全模式，后台将禁用例如：模板管理、标签管理、数据库管理等存在较高安全风险的功能
//V6安全模式，如果启用安全模式，后台将禁用例如：模板管理、标签管理、数据库管理等存在较高安全风险的功能
define('DEDEBIZ_SAFE_MODE', TRUE); // 启用安全模式 define('DEDEBIZ_SAFE_MODE', TRUE); // 启用安全模式
// define('DEDEBIZ_SAFE_MODE', FALSE); 关闭安全模式 // define('DEDEBIZ_SAFE_MODE', FALSE); 关闭安全模式




+ 6
- 6
src/system/customfields.func.php Visa fil

@@ -68,7 +68,7 @@ function GetFormItem($ctag, $admintype = 'admin')
foreach ($items as $v) { foreach ($items as $v) {
$v = trim($v); $v = trim($v);
if ($v != '') { if ($v != '') {
$myformItem .= ($i == 0 ? "<div class='form-check'><label><input type='radio' name='$fieldname' class='np form-check-input' value='$v' checked> $v</label></div>" : "<div class='form-check'><label><input type='radio' name='$fieldname' class='np form-check-input' value='$v'> $v</label></div>");
$myformItem .= ($i == 0 ? "<div class='form-check form-check-inline'><input type='radio' name='$fieldname' class='form-check-input' value='$v' checked><label class='form-check-label'>$v</label></div>" : "<div class='form-check form-check-inline'><input type='radio' name='$fieldname' class='form-check-input' value='$v'><label class='form-check-label'>'$v</label></div>");
$i++; $i++;
} }
} }
@@ -80,9 +80,9 @@ function GetFormItem($ctag, $admintype = 'admin')
$v = trim($v); $v = trim($v);
if ($v != '') { if ($v != '') {
if ($admintype == 'membermodel') { if ($admintype == 'membermodel') {
$myformItem .= "<div class='form-check'><label><input type='checkbox' name='{$fieldname}[]' class='np form-check-input' value='$v'> $v</label></div>";
$myformItem .= "<div class='form-check form-check-inline'><input type='checkbox' name='{$fieldname}[]' class='form-check-input' value='$v'><label class='form-check-label'>$v</label></div>";
} else { } else {
$myformItem .= "<div class='form-check'><label><input type='checkbox' name='{$fieldname}[]' class='np form-check-input' value='$v'> $v</label></div>";
$myformItem .= "<div class='form-check form-check-inline'><input type='checkbox' name='{$fieldname}[]' class='form-check-input' value='$v'><label class='form-check-label'>$v</label></div>";
} }
} }
} }
@@ -352,7 +352,7 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '')
foreach ($items as $v) { foreach ($items as $v) {
$v = trim($v); $v = trim($v);
if ($v == '') continue; if ($v == '') continue;
$myformItem .= ($fvalue == $v ? "<div class='form-check'><label><input type='radio' name='$fieldname' class='np form-check-input' value='$v' checked='checked' /> $v</label></div>" : "<div class='form-check'><label><input type='radio' name='$fieldname' class='np form-check-input' value='$v' /> $v</label></div>");
$myformItem .= ($fvalue == $v ? "<div class='form-check form-check-inline'><input type='radio' name='$fieldname' class='form-check-input' value='$v' checked='checked'><label class='form-check-label'>$v</label></div>" : "<div class='form-check form-check-inline'><input type='radio' name='$fieldname' class='form-check-input' value='$v'><label class='form-check-label'>$v</label></div>");
} }
} }
$innertext = $myformItem; $innertext = $myformItem;
@@ -368,9 +368,9 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '')
continue; continue;
} }
if (in_array($v, $fvalues)) { if (in_array($v, $fvalues)) {
$myformItem .= "<div class='form-check'><label><input type='checkbox' name='{$fieldname}[]' class='np form-check-input' value='$v' checked='checked' /> $v</label></div>";
$myformItem .= "<div class='form-check form-check-inline'><input type='checkbox' name='{$fieldname}[]' class='form-check-input' value='$v' checked='checked'><label class='form-check-label'>$v</label></div>";
} else { } else {
$myformItem .= "<div class='form-check'><label><input type='checkbox' name='{$fieldname}[]' class='np form-check-input' value='$v' /> $v</label></div>";
$myformItem .= "<div class='form-check form-check-inline'><input type='checkbox' name='{$fieldname}[]' class='form-check-input' value='$v'><label class='form-check-label'>$v</label></div>";
} }
} }
} }


+ 1
- 1
src/system/database/dedesqlite.class.php Visa fil

@@ -123,7 +123,7 @@ class DedeSqlite
//为了防止采集等需要较长运行时间的程序超时，在运行这类程序时设置系统等待和交互时间 //为了防止采集等需要较长运行时间的程序超时，在运行这类程序时设置系统等待和交互时间
function SetLongLink() function SetLongLink()
{ {
// @mysqli_query("SET interactive_timeout=3600, wait_timeout=3600 ;", $this->linkID);
//@mysqli_query("SET interactive_timeout=3600, wait_timeout=3600 ;", $this->linkID);
} }
//获得错误描述 //获得错误描述
function GetError() function GetError()


+ 0
- 9
src/system/datalistcp.class.php Visa fil

@@ -2,15 +2,6 @@
if (!defined('DEDEINC')) exit('dedebiz'); if (!defined('DEDEINC')) exit('dedebiz');
/** /**
* 动态分页类 * 动态分页类
* 说明:数据量不大的数据分页,使得数据分页处理变得更加简单化
* 使用方法:
* $dl = new DataListCP(); //初始化动态列表类
* $dl->pagesize = 30; //设定每页显示记录数（默认25条）
* $dl->SetParameter($key,$value); //设定get字符串的变量
* //这两句的顺序不能更换
* $dl->SetTemplate($tplfile); //载入模板
* $dl->SetSource($sql); //设定查询SQL
* $dl->Display(); //显示
* *
* @version $Id: datalistcp.class.php 3 17:02 2010年7月9日Z tianya $ * @version $Id: datalistcp.class.php 3 17:02 2010年7月9日Z tianya $
* @package DedeBIZ.Libraries * @package DedeBIZ.Libraries


+ 1
- 1
src/system/dedevote.class.php Visa fil

@@ -98,7 +98,7 @@ class DedeVote
{ {
//省略参数 //省略参数
if ($lineheight == "") { if ($lineheight == "") {
$lineheight = 24;
$lineheight = 26;
} }
if ($tablewidth == "") { if ($tablewidth == "") {
$tablewidth = "100%"; $tablewidth = "100%";


+ 1
- 1
src/system/enums.func.php Visa fil

@@ -88,7 +88,7 @@ function GetEnumsForm($egroup, $evalue = 0, $formid = '', $seltitle = '')
$formid = $egroup; $formid = $egroup;
} }
$forms = "<select name='$formid' id='$formid' class='enumselect form-control'>\r\n"; $forms = "<select name='$formid' id='$formid' class='enumselect form-control'>\r\n";
$forms .= "\t<option value='0' selected='selected'>--请选择--{$seltitle}</option>\r\n";
$forms .= "\t<option value='0' selected='selected'>请选择{$seltitle}</option>\r\n";
foreach (${'em_'.$egroup.'s'} as $v => $n) { foreach (${'em_'.$egroup.'s'} as $v => $n) {
$prefix = ($v > 500 && $v % 500 != 0) ? '└─ ' : ''; $prefix = ($v > 500 && $v % 500 != 0) ? '└─ ' : '';
if (preg_match("#\.#", $v)) $prefix = ' &nbsp;&nbsp;└── '; if (preg_match("#\.#", $v)) $prefix = ' &nbsp;&nbsp;└── ';


+ 3
- 6
src/system/helpers/cache.helper.php Visa fil

@@ -23,7 +23,7 @@ if (!function_exists('GetCache')) {
global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port; global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port;
$key = md5($key); $key = md5($key);
// 商业组件缓存
//商业组件缓存
if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) { if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) {
$client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port); $client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port);
$client->appid = $cfg_bizcore_appid; $client->appid = $cfg_bizcore_appid;
@@ -62,8 +62,7 @@ if (!function_exists('SetCache')) {
{ {
global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port; global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port;
$key = md5($key); $key = md5($key);
// 商业组件缓存
//商业组件缓存
if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) { if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) {
$client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port); $client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port);
$client->appid = $cfg_bizcore_appid; $client->appid = $cfg_bizcore_appid;
@@ -94,10 +93,8 @@ if (!function_exists('DelCache')) {
function DelCache($prefix, $key) function DelCache($prefix, $key)
{ {
global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port; global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port;
$key = md5($key); $key = md5($key);
// 商业组件缓存
//商业组件缓存
if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) { if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) {
$client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port); $client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port);
$client->appid = $cfg_bizcore_appid; $client->appid = $cfg_bizcore_appid;


+ 6
- 8
src/system/libraries/fixtures/headers.php Visa fil

@@ -8,9 +8,7 @@ if (!defined('DEDEINC')) exit('dedebiz');
* This source file is subject to the MIT license that is bundled * This source file is subject to the MIT license that is bundled
* with this source code in the file LICENSE. * with this source code in the file LICENSE.
*/ */

require_once(DEDEINC."/libraries/fixtures/abstractprovider.php"); require_once(DEDEINC."/libraries/fixtures/abstractprovider.php");

class Headers extends AbstractProvider class Headers extends AbstractProvider
{ {
/** /**
@@ -19,19 +17,19 @@ class Headers extends AbstractProvider
* @var array * @var array
*/ */
protected $data = array( protected $data = array(
// The default User-Agent string.
//The default User-Agent string.
'HTTP_USER_AGENT', 'HTTP_USER_AGENT',
// Header can occur on devices using Opera Mini.
//Header can occur on devices using Opera Mini.
'HTTP_X_OPERAMINI_PHONE_UA', 'HTTP_X_OPERAMINI_PHONE_UA',
// Vodafone specific header: http://www.seoprinciple.com/mobile-web-community-still-angry-at-vodafone/24/
//Vodafone specific header: http://www.seoprinciple.com/mobile-web-community-still-angry-at-vodafone/24/
'HTTP_X_DEVICE_USER_AGENT', 'HTTP_X_DEVICE_USER_AGENT',
'HTTP_X_ORIGINAL_USER_AGENT', 'HTTP_X_ORIGINAL_USER_AGENT',
'HTTP_X_SKYFIRE_PHONE', 'HTTP_X_SKYFIRE_PHONE',
'HTTP_X_BOLT_PHONE_UA', 'HTTP_X_BOLT_PHONE_UA',
'HTTP_DEVICE_STOCK_UA', 'HTTP_DEVICE_STOCK_UA',
'HTTP_X_UCBROWSER_DEVICE_UA', 'HTTP_X_UCBROWSER_DEVICE_UA',
// Sometimes, bots (especially Google) use a genuine user agent, but fill this header in with their email address
//Sometimes, bots (especially Google) use a genuine user agent, but fill this header in with their email address
'HTTP_FROM', 'HTTP_FROM',
'HTTP_X_SCANNER', // Seen in use by Netsparker
'HTTP_X_SCANNER', //Seen in use by Netsparker
); );
}
}

+ 1
- 1
src/system/memberlogin.class.php Visa fil

@@ -397,7 +397,7 @@ class MemberLogin
return -1; return -1;
} else { } else {
if (empty($row['pwd_new']) && function_exists('password_hash')) { if (empty($row['pwd_new']) && function_exists('password_hash')) {
// 升级密码
//升级密码
$newpwd = password_hash($loginpwd, PASSWORD_BCRYPT); $newpwd = password_hash($loginpwd, PASSWORD_BCRYPT);
$inquery = "UPDATE `#@__member` SET pwd='',pwd_new='{$newpwd}' WHERE mid='".$row['mid']."'"; $inquery = "UPDATE `#@__member` SET pwd='',pwd_new='{$newpwd}' WHERE mid='".$row['mid']."'";
$dsql->ExecuteNoneQuery($inquery); $dsql->ExecuteNoneQuery($inquery);


+ 0
- 98
src/system/sitemap.class.php Visa fil

@@ -1,98 +0,0 @@
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 网站地图(sitemap类)
*
* @version $Id: sitemap.class.php 1 15:21 2010年7月5日Z tianya $
* @package DedeBIZ.Libraries
* @copyright Copyright (c) 2022, DedeBIZ.COM
* @license https://www.dedebiz.com/license
* @link https://www.dedebiz.com
*/
require_once(DEDEINC."/channelunit.func.php");
/**
* 网站地图(sitemap类)
*
* @package TypeLink
* @subpackage DedeBIZ.Libraries
* @link https://www.dedebiz.com
*/
class SiteMap
{
var $dsql;
var $artDir;
var $baseDir;
//php5构造函数
function __construct()
{
$this->idCounter = 0;
$this->artDir = $GLOBALS['cfg_arcdir'];
$this->baseDir = $GLOBALS['cfg_cmspath'].$GLOBALS['cfg_basedir'];
$this->idArrary = "";
$this->dsql = $GLOBALS['dsql'];
}
function SiteMap()
{
$this->__construct();
}
//清理类
function Close()
{
}
/**
* 获取网站地图
*
* @access public
* @param string $maptype 地图类型 site:站点 rss:rss
* @return string
*/
function GetSiteMap($maptype = "site")
{
$mapString = "";
if ($maptype == "rss") {
$this->dsql->SetQuery("SELECT id,typedir,isdefault,defaultname,typename,ispart,namerule2,moresite,siteurl,sitepath FROM #@__arctype WHERE ishidden<>1 AND reid=0 AND ispart<>2 ORDER BY sortrank");
} else {
$this->dsql->SetQuery("SELECT id,typedir,isdefault,defaultname,typename,ispart,namerule2,siteurl,sitepath,moresite,siteurl,sitepath FROM #@__arctype WHERE reid=0 AND ishidden<>1 ORDER BY sortrank");
}
$this->dsql->Execute(0);
while ($row = $this->dsql->GetObject(0)) {
if ($maptype == "site") {
$typelink = GetTypeUrl($row->id, MfTypedir($row->typedir), $row->isdefault, $row->defaultname, $row->ispart, $row->namerule2, $row->moresite, $row->siteurl, $row->sitepath);
} else {
$typelink = $GLOBALS['cfg_cmsurl']."/static/rss/".$row->id.".xml";
}
$mapString .= "<div class=\"linkbox\">\r\n<h3><a href='$typelink'>".$row->typename."</a></h3>";
$mapString .= "\t<ul class=\"f6\">\t\t\r".$this->LogicListAllSunType($row->id, $maptype)."\t\n</ul></div>\r\n";
}
return $mapString;
}
/**
* 获得子类目的递归调用
*
* @access public
* @param int $id 栏目ID
* @param string $maptype 地图类型
* @return string
*/
function LogicListAllSunType($id, $maptype)
{
$fid = $id;
$mapString = "";
if ($maptype == "rss") {
$this->dsql->SetQuery("SELECT id,typedir,isdefault,defaultname,typename,ispart,namerule2,moresite,siteurl,sitepath FROM #@__arctype WHERE reid='".$id."' AND ishidden<>1 AND ispart<>2 ORDER BY sortrank");
} else {
$this->dsql->SetQuery("SELECT id,typedir,isdefault,defaultname,typename,ispart,namerule2,moresite,siteurl,sitepath FROM #@__arctype WHERE reid='".$id."' AND ishidden<>1 ORDER BY sortrank");
}
$this->dsql->Execute($fid);
while ($row = $this->dsql->GetObject($fid)) {
if ($maptype == "site") {
$typelink = GetTypeUrl($row->id, MfTypedir($row->typedir), $row->isdefault, $row->defaultname, $row->ispart, $row->namerule2, $row->moresite, $row->siteurl, $row->sitepath);
} else {
$typelink = $GLOBALS['cfg_cmsurl']."/static/rss/".$row->id.".xml";
}
$mapString .= "<li><a href='$typelink'>".$row->typename."</a></li>\n\t\t";
$mapString .= $this->LogicListAllSunType($row->id, $maptype);
}
return $mapString;
}
}

+ 10
- 10
src/system/taglib/infolink.lib.php Visa fil

@@ -64,14 +64,14 @@ function lib_infolink(&$ctag, &$refObj)
$fields['nativeplace'] .= " <a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&nativeplace={$eid}&infotype={$infotype}'>{$em}</a>\r\n"; $fields['nativeplace'] .= " <a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&nativeplace={$eid}&infotype={$infotype}'>{$em}</a>\r\n";
} }
} else { } else {
$sontype = (($nativeplace % 500 != 0) ? $nativeplace : 0); // 子集
$toptype = (($nativeplace % 500 == 0) ? (int)$nativeplace : (int)($nativeplace - ($nativeplace % 500))); // 顶级联动分类
$sontype = (($nativeplace % 500 != 0) ? $nativeplace : 0); //子集
$toptype = (($nativeplace % 500 == 0) ? (int)$nativeplace : (int)($nativeplace - ($nativeplace % 500))); //顶级联动分类
$fields['nativeplace'] = "<a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&nativeplace={$toptype}&infotype={$infotype}'> {$em_nativeplaces[$toptype]}</a> &gt;"; $fields['nativeplace'] = "<a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&nativeplace={$toptype}&infotype={$infotype}'> {$em_nativeplaces[$toptype]}</a> &gt;";
if ($nativeplace % 500 == 0) { if ($nativeplace % 500 == 0) {
// 1级分类
//1级分类
foreach ($em_nativeplaces as $eid => $em) { foreach ($em_nativeplaces as $eid => $em) {
if ($eid < $toptype + 1 || $eid > $toptype + 499) continue; if ($eid < $toptype + 1 || $eid > $toptype + 499) continue;
if (is_str_float($eid)) continue; // 仅显示2级
if (is_str_float($eid)) continue; //仅显示2级
if ($eid == $nativeplace) { if ($eid == $nativeplace) {
$fields['nativeplace'] .= " {$em}\r\n"; $fields['nativeplace'] .= " {$em}\r\n";
} else { } else {
@@ -79,7 +79,7 @@ function lib_infolink(&$ctag, &$refObj)
} }
} }
} else if(!is_str_float($nativeplace)) { } else if(!is_str_float($nativeplace)) {
// 2级分类
//2级分类
$fields['nativeplace'] .= "<span> {$em_nativeplaces[$sontype]}</span>"; $fields['nativeplace'] .= "<span> {$em_nativeplaces[$sontype]}</span>";
$i = 0; $i = 0;
$ff = ""; $ff = "";
@@ -99,7 +99,7 @@ function lib_infolink(&$ctag, &$refObj)
if($i > 0) $fields['nativeplace'] .= " &gt; "; if($i > 0) $fields['nativeplace'] .= " &gt; ";
$fields['nativeplace'] .= $ff; $fields['nativeplace'] .= $ff;
} else { } else {
// 3级分类
//3级分类
$t = intval($nativeplace); $t = intval($nativeplace);
$fields['nativeplace'] .= "<a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&nativeplace={$t}&infotype={$infotype}'> {$em_nativeplaces[$t]}</a> &gt;"; $fields['nativeplace'] .= "<a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&nativeplace={$t}&infotype={$infotype}'> {$em_nativeplaces[$t]}</a> &gt;";
foreach ($em_nativeplaces as $eid => $em) { foreach ($em_nativeplaces as $eid => $em) {
@@ -131,10 +131,10 @@ function lib_infolink(&$ctag, &$refObj)
$fields['infotype'] = "<a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&infotype={$toptype}&nativeplace={$nativeplace}'>{$em_infotypes[$toptype]}</a> &gt; "; $fields['infotype'] = "<a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&infotype={$toptype}&nativeplace={$nativeplace}'>{$em_infotypes[$toptype]}</a> &gt; ";
if ($infotype % 500 == 0) { if ($infotype % 500 == 0) {
// 1级分类
//1级分类
foreach ($em_infotypes as $eid => $em) { foreach ($em_infotypes as $eid => $em) {
if ($eid < $toptype + 1 || $eid > $toptype + 499) continue; if ($eid < $toptype + 1 || $eid > $toptype + 499) continue;
if (is_str_float($eid)) continue; // 仅显示2级
if (is_str_float($eid)) continue; //仅显示2级
if ($eid == $infotype) { if ($eid == $infotype) {
$fields['infotype'] .= " {$em}\r\n"; $fields['infotype'] .= " {$em}\r\n";
} else { } else {
@@ -142,7 +142,7 @@ function lib_infolink(&$ctag, &$refObj)
} }
} }
} else if(!is_str_float($infotype)) { } else if(!is_str_float($infotype)) {
// 2级分类
//2级分类
$fields['infotype'] .= "<span> {$em_infotypes[$sontype]}</span>"; $fields['infotype'] .= "<span> {$em_infotypes[$sontype]}</span>";
$i = 0; $i = 0;
$ff = ""; $ff = "";
@@ -162,7 +162,7 @@ function lib_infolink(&$ctag, &$refObj)
if($i > 0) $fields['infotype'] .= " &gt; "; if($i > 0) $fields['infotype'] .= " &gt; ";
$fields['infotype'] .= $ff; $fields['infotype'] .= $ff;
} else { } else {
// 3级分类
//3级分类
$t = intval($infotype); $t = intval($infotype);
$fields['infotype'] .= "<a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&nativeplace={$nativeplace}&infotype={$t}'> {$em_infotypes[$t]}</a> &gt;"; $fields['infotype'] .= "<a href='{$baseurl}apps/list.php?channelid={$channelid}&tid={$typeid}&nativeplace={$nativeplace}&infotype={$t}'> {$em_infotypes[$t]}</a> &gt;";
foreach ($em_infotypes as $eid => $em) { foreach ($em_infotypes as $eid => $em) {


+ 2
- 2
src/system/userlogin.class.php Visa fil

@@ -90,7 +90,7 @@ function CheckCatalog($cid, $msg)
return TRUE; return TRUE;
} }
if (!in_array($cid, $admin_catalogs)) { if (!in_array($cid, $admin_catalogs)) {
ShowMsg(" $msg <br><br><a href='javascript:history.go(-1);'>点击此返回上一页&gt;</a>", 'javascript:;');
ShowMsg(" $msg <br><br><a href='javascript:history.go(-1);'>点击返回上一页</a>", 'javascript:;');
exit(); exit();
} }
return TRUE; return TRUE;
@@ -224,7 +224,7 @@ class userLogin
}else { }else {
$upsql = ""; $upsql = "";
if (empty($row->pwd_new) && function_exists('password_hash')) { if (empty($row->pwd_new) && function_exists('password_hash')) {
// 升级密码
//升级密码
$newpwd = password_hash($this->userPwd, PASSWORD_BCRYPT); $newpwd = password_hash($this->userPwd, PASSWORD_BCRYPT);
$upsql .= ",pwd='',pwd_new='{$newpwd}'"; $upsql .= ",pwd='',pwd_new='{$newpwd}'";
} }


+ 1
- 1
src/user/archives_sg_add.php Visa fil

@@ -50,7 +50,7 @@ function _SaveArticle(){ }
else if ($dopost == 'save') { else if ($dopost == 'save') {
include_once(DEDEINC."/image.func.php"); include_once(DEDEINC."/image.func.php");
include_once(DEDEINC."/libraries/oxwindow.class.php"); include_once(DEDEINC."/libraries/oxwindow.class.php");
// 游客需要校验验证码
//游客需要校验验证码
if ($cfg_ml->M_ID === 0) { if ($cfg_ml->M_ID === 0) {
$svali = GetCkVdValue(); $svali = GetCkVdValue();
if (strtolower($vdcode) != $svali || $svali == '') { if (strtolower($vdcode) != $svali || $svali == '') {


+ 1
- 1
src/user/content_list.php Visa fil

@@ -74,7 +74,7 @@ $query = "SELECT arc.id,arc.typeid,arc.senddate,arc.flag,arc.ismake,arc.channel,
left join `#@__channeltype` ch on ch.id=arc.channel left join `#@__channeltype` ch on ch.id=arc.channel
$whereSql order by arc.senddate desc "; $whereSql order by arc.senddate desc ";
$dlist = new DataListCP(); $dlist = new DataListCP();
$dlist->pagesize = 30;
$dlist->pagesize = 10;
$dlist->SetParameter("dopost", "listArchives"); $dlist->SetParameter("dopost", "listArchives");
$dlist->SetParameter("keyword", $keyword); $dlist->SetParameter("keyword", $keyword);
$dlist->SetParameter("cid", $cid); $dlist->SetParameter("cid", $cid);


+ 1
- 1
src/user/content_sg_list.php Visa fil

@@ -61,7 +61,7 @@ $query = "SELECT arc.aid,arc.aid as id,arc.typeid,arc.senddate,arc.channel,arc.c
$whereSql $whereSql
ORDER BY arc.aid desc "; ORDER BY arc.aid desc ";
$dlist = new DataListCP(); $dlist = new DataListCP();
$dlist->pagesize = 30;
$dlist->pagesize = 10;
$dlist->SetParameter("dopost", "listArchives"); $dlist->SetParameter("dopost", "listArchives");
$dlist->SetParameter("keyword", $keyword); $dlist->SetParameter("keyword", $keyword);
$dlist->SetParameter("cid", $cid); $dlist->SetParameter("cid", $cid);


+ 1
- 1
src/user/inc/archives_check.php Visa fil

@@ -11,7 +11,7 @@
if (!defined('DEDEMEMBER')) exit('dedebiz'); if (!defined('DEDEMEMBER')) exit('dedebiz');
include_once(DEDEINC.'/image.func.php'); include_once(DEDEINC.'/image.func.php');
include_once(DEDEINC.'/libraries/oxwindow.class.php'); include_once(DEDEINC.'/libraries/oxwindow.class.php');
// 游客需要校验验证码
//游客需要校验验证码
if ($cfg_ml->M_ID === 0) { if ($cfg_ml->M_ID === 0) {
$svali = GetCkVdValue(); $svali = GetCkVdValue();
if (strtolower($vdcode) != $svali || $svali == '') { if (strtolower($vdcode) != $svali || $svali == '') {


+ 1
- 1
src/user/mypay.php Visa fil

@@ -18,7 +18,7 @@ if (!isset($dopost)) $dopost = '';
if ($dopost == '') { if ($dopost == '') {
$query = "SELECT * FROM `#@__member_operation` WHERE mid='".$cfg_ml->M_ID."' And product='archive' order by aid desc"; $query = "SELECT * FROM `#@__member_operation` WHERE mid='".$cfg_ml->M_ID."' And product='archive' order by aid desc";
$dlist = new DataListCP(); $dlist = new DataListCP();
$dlist->pagesize = 30;
$dlist->pagesize = 10;
$dlist->SetTemplate(DEDEMEMBER.'/templets/mypay.htm'); $dlist->SetTemplate(DEDEMEMBER.'/templets/mypay.htm');
$dlist->SetSource($query); $dlist->SetSource($query);
$dlist->Display(); $dlist->Display();


+ 1
- 1
src/user/mystow.php Visa fil

@@ -28,7 +28,7 @@ while ($row = $dsql->GetArray('nn')) {
$rows[] = $row; $rows[] = $row;
} }
$dlist = new DataListCP(); $dlist = new DataListCP();
$dlist->pagesize = 30;
$dlist->pagesize = 10;
$dlist->SetTemplate(DEDEMEMBER."/templets/mystow.htm"); $dlist->SetTemplate(DEDEMEMBER."/templets/mystow.htm");
$dlist->SetSource($sql); $dlist->SetSource($sql);
$dlist->Display(); $dlist->Display();

+ 1
- 1
src/user/operation.php Visa fil

@@ -30,7 +30,7 @@ function GetSta($sta)
if ($dopost == '') { if ($dopost == '') {
$sql = "SELECT * FROM `#@__member_operation` WHERE mid='".$cfg_ml->M_ID."' AND product<>'archive' ORDER BY aid DESC"; $sql = "SELECT * FROM `#@__member_operation` WHERE mid='".$cfg_ml->M_ID."' AND product<>'archive' ORDER BY aid DESC";
$dlist = new DataListCP(); $dlist = new DataListCP();
$dlist->pagesize = 30;
$dlist->pagesize = 10;
$dlist->SetTemplate(DEDEMEMBER."/templets/operation.htm"); $dlist->SetTemplate(DEDEMEMBER."/templets/operation.htm");
$dlist->SetSource($sql); $dlist->SetSource($sql);
$dlist->Display(); $dlist->Display();


+ 1
- 1
src/user/pm.php Visa fil

@@ -90,7 +90,7 @@ else {
} }
$query = "SELECT * FROM `#@__member_pms` WHERE $wsql ORDER BY sendtime DESC"; $query = "SELECT * FROM `#@__member_pms` WHERE $wsql ORDER BY sendtime DESC";
$dlist = new DataListCP(); $dlist = new DataListCP();
$dlist->pagesize = 30;
$dlist->pagesize = 10;
$dlist->SetParameter("dopost", $dopost); $dlist->SetParameter("dopost", $dopost);
$dlist->SetTemplate(DEDEMEMBER.'/templets/pm-main.htm'); $dlist->SetTemplate(DEDEMEMBER.'/templets/pm-main.htm');
$dlist->SetSource($query); $dlist->SetSource($query);


+ 1
- 1
src/user/shops_orders.php Visa fil

@@ -38,7 +38,7 @@ function GetSta($sta, $oid)
if ($dopost == '') { if ($dopost == '') {
$sql = "SELECT * FROM `#@__shops_orders` WHERE userid='".$cfg_ml->M_ID."' ORDER BY stime DESC"; $sql = "SELECT * FROM `#@__shops_orders` WHERE userid='".$cfg_ml->M_ID."' ORDER BY stime DESC";
$dl = new DataListCP(); $dl = new DataListCP();
$dl->pagesize = 30;
$dl->pagesize = 10;
//这两句的顺序不能更换 //这两句的顺序不能更换
$dl->SetTemplate(dirname(__FILE__)."/templets/shops_orders.htm"); //载入模板 $dl->SetTemplate(dirname(__FILE__)."/templets/shops_orders.htm"); //载入模板
$dl->SetSource($sql); //设定查询SQL $dl->SetSource($sql); //设定查询SQL


+ 1
- 1
src/user/shops_products.php Visa fil

@@ -44,7 +44,7 @@ if ($dopost == '') {
} }
$sql = "SELECT * FROM `#@__shops_products` WHERE userid='".$cfg_ml->M_ID."' $addsql ORDER BY aid ASC"; $sql = "SELECT * FROM `#@__shops_products` WHERE userid='".$cfg_ml->M_ID."' $addsql ORDER BY aid ASC";
$dl = new DataListCP(); $dl = new DataListCP();
$dl->pagesize = 30;
$dl->pagesize = 10;
if (!empty($oid)) $dl->SetParameter('oid', $oid); if (!empty($oid)) $dl->SetParameter('oid', $oid);
//这两句的顺序不能更换 //这两句的顺序不能更换
$dl->SetTemplate(dirname(__FILE__)."/templets/shops_products.htm"); //载入模板 $dl->SetTemplate(dirname(__FILE__)."/templets/shops_products.htm"); //载入模板


Write Förhandsgranska
Laddar…
Avbryt
Spara