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

ok

tags/6.2.10
叙述、别离 10 months ago
parent
8620b290e4
commit
e67217620c
22 changed files with 36 additions and 39 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      src/admin/album_add.php
  2. +1
    -1
      src/admin/album_edit.php
  3. +1
    -1
      src/admin/archives_do.php
  4. +2
    -2
      src/admin/article_description_main.php
  5. +1
    -1
      src/admin/content_list.php
  6. +1
    -1
      src/admin/content_sg_list.php
  7. +1
    -1
      src/admin/friendlink_add.php
  8. +4
    -4
      src/admin/inc/inc_archives_functions.php
  9. +4
    -4
      src/admin/index_testenv.php
  10. +0
    -1
      src/admin/makehtml_homepage.php
  11. +1
    -1
      src/admin/makehtml_list_action.php
  12. +1
    -1
      src/admin/templets/content_i_list.htm
  13. +1
    -1
      src/admin/templets/content_list.htm
  14. +1
    -1
      src/admin/templets/content_sg_list.htm
  15. +7
    -7
      src/admin/templets/index_body.htm
  16. +1
    -1
      src/apps/download.php
  17. +1
    -1
      src/apps/list.php
  18. +3
    -5
      src/install/index.php
  19. +1
    -1
      src/system/helpers/upload.helper.php
  20. +1
    -1
      src/system/typelink/typeunit.class.admin.php
  21. +1
    -1
      src/user/inc/inc_archives_functions.php
  22. +1
    -1
      src/user/inc/inc_pwd_functions.php

+ 1
- 1
src/admin/album_add.php View File

@@ -121,7 +121,7 @@ if ($dopost != 'save') {
$ntime = time();
$savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
CreateDir($savepath);
$fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
$fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000,9999));
$fullUrl = $fullUrl.$ext;
file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
$info = '';


+ 1
- 1
src/admin/album_edit.php View File

@@ -195,7 +195,7 @@ if ($dopost != 'save') {
$ntime = time();
$savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
CreateDir($savepath);
$fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
$fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000,9999));
$fullUrl = $fullUrl.$ext;
file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
$info = '';


+ 1
- 1
src/admin/archives_do.php View File

@@ -33,7 +33,7 @@ if ($dopost == 'editArchives') {
$ntime = time();
$savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
CreateDir($savepath);
$fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
$fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000,9999));
$fullUrl = $fullUrl.".png";
file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
//加水印


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

@@ -79,7 +79,7 @@ if ($dojob == '') {
exit();
}
$dvlen = $tjlen * 1;
$tjsta = "<div style='margin-bottom:18px;width:260px;height:18px;text-align:left;border:1px solid #1eb867;border-radius:.5rem'><div style='max-width:260px;width:$dvlen%;height:18px;background:#1eb867'></div></div>";
$tjsta = "<div class='progress mb-3'><div class='progress-bar progress-bar-striped bg-success' role='progressbar' aria-valuenow='$dvlen%' aria-valuemin='0' aria-valuemax='100' style='width:$dvlen%'>$dvlen%</div></div>";
$tjsta .= "完成更新文档总数<span class='text-primary'>$tjlen</span>%";
$nurl = "article_description_main.php?totalnum=$totalnum&startdd={$startdd}&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}";
ShowMsg($tjsta, $nurl, 0, 500);
@@ -139,7 +139,7 @@ if ($dojob == '') {
$tjlen = 100;
}
$dvlen = $tjlen * 1;
$tjsta = "<div style='margin-bottom:18px;width:260px;height:18px;text-align:left;border:1px solid #1eb867;border-radius:.5rem'><div style='max-width:260px;width:$dvlen%;height:18px;background:#1eb867'></div></div>";
$tjsta = "<div class='progress mb-3'><div class='progress-bar progress-bar-striped bg-success' role='progressbar' aria-valuenow='$dvlen%' aria-valuemin='0' aria-valuemax='100' style='width:$dvlen%'>$dvlen%</div></div>";
$tjsta .= "完成更新文档总数<span class='text-primary'>$tjlen</span>%";
if ($tjnum < $totalnum) {
$nurl = "article_description_main.php?totalnum=$totalnum&startdd=".($startdd + $pagesize)."&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}";


+ 1
- 1
src/admin/content_list.php View File

@@ -1,6 +1,6 @@
<?php
/**
* 文档列表
* 所有文档列表
*
* @version $id:content_list.php 14:31 2010年7月12日 tianya $
* @package DedeBIZ.Administrator


+ 1
- 1
src/admin/content_sg_list.php View File

@@ -1,6 +1,6 @@
<?php
/**
* 文档管理列表
* 单表文档列表
*
* @version $id:content_sg_list.php 14:31 2010年7月12日 tianya $
* @package DedeBIZ.Administrator


+ 1
- 1
src/admin/friendlink_add.php View File

@@ -19,7 +19,7 @@ if ($dopost == "add") {
if (!preg_match("#(jpg|gif|png)$#", $shortname)) {
$shortname = '.gif';
}
$filename = MyDate("ymdHis", time()).mt_rand(1000, 9999).$shortname;
$filename = MyDate("ymdHis", time()).mt_rand(1000,9999).$shortname;
$imgurl = $cfg_medias_dir."/flink";
if (!is_dir($cfg_basedir.$imgurl)) {
MkdirAll($cfg_basedir.$imgurl, $cfg_dir_purview);


+ 4
- 4
src/admin/inc/inc_archives_functions.php View File

@@ -138,7 +138,7 @@ function GetCurContent($body)
} else {
continue;
}
$milliSecondN = dd2char($milliSecond.mt_rand(1000, 8000));
$milliSecondN = dd2char($milliSecond.mt_rand(1000,8000));
$value = trim($value);
$rndFileName = $imgPath.'/'.$milliSecondN.'-'.$key.$itype;
$fileurl = $imgUrl.'/'.$milliSecondN.'-'.$key.$itype;
@@ -200,7 +200,7 @@ function GetRemoteImage($url, $uid = 0)
} else {
$itype = '.jpg';
}
$rndname = dd2char($uid.'_'.MyDate('mdHis', time()).mt_rand(1000, 9999));
$rndname = dd2char($uid.'_'.MyDate('mdHis', time()).mt_rand(1000,9999));
$rndtrueName = $imgPath.'/'.$rndname.$itype;
$fileurl = $imgUrl.'/'.$rndname.$itype;
$ok = $htd->SaveToBin($rndtrueName);
@@ -359,7 +359,7 @@ function GetDDImage($litpic, $picname, $isremote)
}
$savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
CreateDir($savepath);
$fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
$fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000,9999));
if (strtolower($_FILES[$litpic]['type']) == "image/gif") {
$fullUrl = $fullUrl.".gif";
} else if (strtolower($_FILES[$litpic]['type']) == "image/png") {
@@ -681,7 +681,7 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '')
} else {
$savepath = $cfg_image_dir.'/'.date("%Y-%m", $ntime);
CreateDir($savepath);
$fullUrl = $savepath.'/'.date("%d", $ntime).dd2char(date("%H%M%S", $ntime).'0'.$cuserLogin->getUserID().'0'.mt_rand(1000, 9999));
$fullUrl = $savepath.'/'.date("%d", $ntime).dd2char(date("%H%M%S", $ntime).'0'.$cuserLogin->getUserID().'0'.mt_rand(1000,9999));
}
if (strtolower($_FILES[$upname]['type']) == "image/gif") {
$fullUrl = $fullUrl.".gif";


+ 4
- 4
src/admin/index_testenv.php View File

@@ -123,7 +123,7 @@ if (!function_exists('IsWritable')) {
$safeMsg = array();
$dirname = str_replace('index_body.php', '', strtolower($_SERVER['PHP_SELF']));
if (!DEDEBIZ_SAFE_MODE) {
$safeMsg[] = '系统运行环境为开发模式，建议您启用安全模式 <a href="index_body.php?dopost=safe_mode" class="btn btn-success btn-xs">详情</a>';
$safeMsg[] = '系统运行环境为开发模式，建议您启用安全模式<a href="index_body.php?dopost=safe_mode" class="btn btn-success btn-xs ml-2">详情</a>';
}
if (!IsSSL()) {
$safeMsg[] = '检测到网址非安全链接，建议您部署https';
@@ -139,13 +139,13 @@ if (preg_match("#[\\|/]admin[\\|/]#", $dirname)) {
}
$rs = TestAdminPWD();
if ($rs < 0) {
$linkurl = '<a href="sys_admin_user.php" class="btn btn-success btn-xs">修改</a>';
$linkurl = '<a href="sys_admin_user.php" class="btn btn-success btn-xs ml-2">修改</a>';
switch ($rs) {
case -1:
$msg = "检测到管理员默认名称没有修改，建议您修改 {$linkurl}";
$msg = "检测到默认账号没有修改，建议您修改{$linkurl}";
break;
case -2:
$msg = "检测到管理员默认名称和密码没有修改，建议您修改 {$linkurl}";
$msg = "检测到默认账号和密码没有修改，建议您修改{$linkurl}";
break;
}
$safeMsg[] = $msg;


+ 0
- 1
src/admin/makehtml_homepage.php View File

@@ -81,7 +81,6 @@ if ($dopost == "view") {
$GLOBALS['_arclistEnv'] = 'index';
$pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet);
$pv->SaveToHtml($homeFile);
echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/web/css/bootstrap.min.css\"><link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/web/css/admin.css\">";
ShowMsg("更新静态首页，<a href='$position' target='_blank'>点击浏览</a>", "javascript:;");
} else {
//动态浏览


+ 1
- 1
src/admin/makehtml_list_action.php View File

@@ -43,7 +43,7 @@ else if ($gotype == 'mkall') {
if (file_exists($mkcachefile)) require_once($mkcachefile);
}
if (!$idArray) {
ShowMsg("暂无栏目，请添加栏目", "javascript:;");
ShowMsg("暂无栏目", "javascript:;");
exit;
}
//当前更新栏目id


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

@@ -68,7 +68,7 @@
<td width="6%">选择</td>
<td width="6%">id</td>
<td width="26%">文档标题</td>
<td width="10%">时间</td>
<td width="10%">更新时间</td>
<td width="12%">栏目</td>
<td width="6%">点击</td>
<td width="6%">网页</td>


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

@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<title>文档列表</title>
<title>所有文档列表</title>
<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">


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

@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<title>文档管理列表</title>
<title>单表文档列表</title>
<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">


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

@@ -174,20 +174,20 @@
</div>
<div class="modal-footer">
<div id="btnStep0" class="btnStep">
<button id="btnCancel" type="button" class="btn btn-secondary" data-dismiss="modal">知道了</button>
<button id="btnCancel" type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">知道了</button>
</div>
<div id="btnStep1" class="btnStep"></div>
<div id="btnStep2" class="btnStep">
<button id="btnCancel" type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
<button id="btnBackup" type="button" class="btn btn-outline-success">备份</button>
<button id="btnGoStep3" type="button" class="btn btn-success">下一步</button>
<button id="btnCancel" type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
<button id="btnBackup" type="button" class="btn btn-outline-success btn-sm">备份</button>
<button id="btnGoStep3" type="button" class="btn btn-success btn-sm">下一步</button>
</div>
<div id="btnStep3" class="btnStep">
<button id="btnCancel" type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
<button id="btnGoStep4" type="button" class="btn btn-success">下载</button>
<button id="btnCancel" type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
<button id="btnGoStep4" type="button" class="btn btn-success btn-sm">下载</button>
</div>
<div id="btnStep5" class="btnStep">
<button id="btnOK" type="button" class="btn btn-success" data-dismiss="modal">完成</button>
<button id="btnOK" type="button" class="btn btn-success btn-sm" data-dismiss="modal">完成</button>
</div>
</div>
</div>


+ 1
- 1
src/apps/download.php View File

@@ -165,7 +165,7 @@ else if ($open == 2) {
}
$memberTypes[0] = "游客或没权限会员";
$msgtitle = "您没有权限下载软件：{$arctitle}";
$moremsg = "该软件需要等级<span class='text-primary'>".$memberTypes[$needRank]."</span>才能下载，您目前等级是<span class='text-primary'>".$memberTypes[$cfg_ml->M_Rank]."</span><a href='{$cfg_memberurl}/buy.php' class='btn btn-success btn-sm ml-2'>升级会员</button>";
$moremsg = "该软件需要等级<span class='text-primary'>".$memberTypes[$needRank]."</span>才能下载，您目前等级是<span class='text-primary'>".$memberTypes[$cfg_ml->M_Rank]."</span><a href='{$cfg_memberurl}/buy.php' class='btn btn-success btn-sm ml-2'>升级会员</a>";
include_once(DEDETEMPLATE.'/apps/view_msg.htm');
exit();
}


+ 1
- 1
src/apps/list.php View File

@@ -48,7 +48,7 @@ if (isset($lv->Fields['corank']) && $lv->Fields['corank'] > 0) {
}
$memberTypes[0] = "游客或没权限会员";
$msgtitle = "您没有权限浏览栏目：{$lv->Fields['typename']}";
$moremsg = "该栏目需要等级<span class='text-primary'>".$memberTypes[$lv->Fields['corank']]."</span>才能浏览，您目前等级是<span class='text-primary'>".$memberTypes[$cfg_ml->M_Rank]."</span><a href='{$cfg_memberurl}/buy.php' class='btn btn-success btn-sm ml-2'>升级会员</button>";
$moremsg = "该栏目需要等级<span class='text-primary'>".$memberTypes[$lv->Fields['corank']]."</span>才能浏览，您目前等级是<span class='text-primary'>".$memberTypes[$cfg_ml->M_Rank]."</span><a href='{$cfg_memberurl}/buy.php' class='btn btn-success btn-sm ml-2'>升级会员</a>";
include_once(DEDETEMPLATE.'/apps/view_msg_catalog.htm');
exit();
}


+ 3
- 5
src/install/index.php View File

@@ -210,8 +210,7 @@ else if ($step==2) {
else $rs = mysql_query(str_replace('#~lang~#',$dblang,$query),$conn);
}
$query='';
} else if (!preg_match("#^(\/\/|--)#", $line))
{
} else if (!preg_match("#^(\/\/|--)#", $line)) {
$query .= $line;
}
}
@@ -263,9 +262,8 @@ else if ($step==10) {
header("Expires:0\r\n");
$conn = @mysql_connect($dbhost,$dbuser,$dbpwd);
$info = "";
if ($conn)
{
if (empty($dbname)){
if ($conn) {
if (empty($dbname)) {
$info = "信息正确";
} else {
$info = mysql_select_db($dbname,$conn)? "数据库已经存在，系统覆盖数据库": "数据库不存在，系统自动创建";


+ 1
- 1
src/system/helpers/upload.helper.php View File

@@ -143,7 +143,7 @@ if (!function_exists('MemberUploads')) {
exit();
}
if ($exname == '') {
$filename = $cfg_user_dir."/$userid/".dd2char($nowtme.'-'.mt_rand(1000, 9999)).'.'.$sname;
$filename = $cfg_user_dir."/$userid/".dd2char($nowtme.'-'.mt_rand(1000,9999)).'.'.$sname;
} else {
$filename = $cfg_user_dir."/{$userid}/{$exname}.".$sname;
}


+ 1
- 1
src/system/typelink/typeunit.class.admin.php View File

@@ -153,7 +153,7 @@ class TypeUnit
echo "</td></tr></table>";
$i++;
} if ($i === 0) {
echo "<div class='text-center py-2'>暂无栏目，请添加栏目</div>";
echo "<div class='text-center py-2'>暂无栏目</div>";
}
}
/**


+ 1
- 1
src/user/inc/inc_archives_functions.php View File

@@ -328,7 +328,7 @@ function GetCurContent(&$body)
$itype = '.jpg';
}
}
$milliSecondN = dd2char($milliSecond.'-'.mt_rand(1000, 8000));
$milliSecondN = dd2char($milliSecond.'-'.mt_rand(1000,8000));
$value = trim($value);
$rndFileName = $imgPath."/".$milliSecondN.'-'.$key.$itype;
$fileurl = $imgUrl."/".$milliSecondN.'-'.$key.$itype;


+ 1
- 1
src/user/inc/inc_pwd_functions.php View File

@@ -132,7 +132,7 @@ function member($mail, $userid)
* @param string $mid 会员id
* @param string $userid 账号
* @param string $mailto 发送邮件地址
* @param string $send 为Y发送邮件,为N不发送邮件默认为Y
* @param string $send 邮件默认为Y，Y发送，N不发送
* @return string
*/
function sn($mid, $userid, $mailto, $send = 'Y')


Write Preview
Loading…
Cancel
Save