Browse Source

修改插入多图界面和文件格式

tags/6.1.0^2
xushubieli 2 years ago
parent
commit
4cb45d9644
58 changed files with 153 additions and 158 deletions
  1. +41
    -61
      src/admin/dialog/select_mimages.php
  2. +1
    -1
      src/include/arc.archives.class.php
  3. +2
    -1
      src/include/arc.freelist.class.php
  4. +2
    -1
      src/include/arc.listview.class.php
  5. +2
    -1
      src/include/arc.partview.class.php
  6. +2
    -1
      src/include/arc.rssview.class.php
  7. +2
    -1
      src/include/arc.searchview.class.php
  8. +2
    -1
      src/include/arc.sglistview.class.php
  9. +2
    -1
      src/include/arc.sgpage.class.php
  10. +2
    -1
      src/include/arc.specview.class.php
  11. +2
    -1
      src/include/arc.taglist.class.php
  12. +1
    -1
      src/include/autoload.inc.php
  13. +1
    -1
      src/include/autoload7.inc.php
  14. +2
    -1
      src/include/channelunit.class.php
  15. +2
    -1
      src/include/channelunit.func.php
  16. +2
    -1
      src/include/customfields.func.php
  17. +2
    -1
      src/include/dedebiz.class.php
  18. +2
    -1
      src/include/dedecollection.func.php
  19. +2
    -1
      src/include/dedehttpdown.class.php
  20. +2
    -1
      src/include/dedemodule.class.php
  21. +2
    -1
      src/include/dedetag.class.php
  22. +2
    -1
      src/include/dedetemplate.class.php
  23. +2
    -1
      src/include/dedevote.class.php
  24. +2
    -1
      src/include/diyform.cls.php
  25. +2
    -1
      src/include/downmix.inc.php
  26. +2
    -1
      src/include/enums.func.php
  27. +2
    -1
      src/include/filter.inc.php
  28. +2
    -1
      src/include/helpers/archive.helper.php
  29. +2
    -1
      src/include/helpers/cache.helper.php
  30. +2
    -1
      src/include/helpers/channelunit.helper.php
  31. +2
    -1
      src/include/helpers/charset.helper.php
  32. +2
    -1
      src/include/helpers/cookie.helper.php
  33. +2
    -1
      src/include/helpers/debug.helper.php
  34. +2
    -1
      src/include/helpers/extend.helper.php
  35. +2
    -1
      src/include/helpers/file.helper.php
  36. +2
    -1
      src/include/helpers/filter.helper.php
  37. +2
    -1
      src/include/helpers/image.helper.php
  38. +2
    -1
      src/include/helpers/string.helper.php
  39. +2
    -1
      src/include/helpers/test.helper.php
  40. +2
    -1
      src/include/helpers/time.helper.php
  41. +2
    -1
      src/include/helpers/upload.helper.php
  42. +2
    -1
      src/include/helpers/util.helper.php
  43. +2
    -1
      src/include/helpers/validate.helper.php
  44. +2
    -1
      src/include/image.class.php
  45. +2
    -1
      src/include/image.func.php
  46. +5
    -36
      src/include/inc/inc_fun_funAdmin.php
  47. +1
    -5
      src/include/inc/inc_fun_funString.php
  48. +2
    -1
      src/include/memberlogin.class.php
  49. +1
    -1
      src/include/oxwindow.class.php
  50. +2
    -1
      src/include/sitemap.class.php
  51. +2
    -1
      src/include/taglib/channel/specialtopic.lib.php
  52. +2
    -1
      src/include/tpllib/plus_memberlist.php
  53. +2
    -1
      src/include/typelink.class.php
  54. +2
    -1
      src/include/typeunit.class.admin.php
  55. +2
    -1
      src/include/typeunit.class.menu.php
  56. +2
    -1
      src/include/typeunit.class.selector.php
  57. +2
    -1
      src/include/userlogin.class.php
  58. +2
    -2
      src/member/index_do.php

+ 41
- 61
src/admin/dialog/select_mimages.php View File

@@ -2,59 +2,53 @@
require_once(dirname(__FILE__)."/config.php");
include(DEDEDATA.'/mark/inc_photowatermark_config.php');
?>
<!doctype html>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>插入多图</title>
<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0"/>
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="user-scalable=no,width=device-width,initial-scale=1.0,maximum-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="format-detection" content="telephone=no">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>插入多图</title>
<style>
html,body{height:100%;margin:0;padding:0;background:#fff;}
ul{margin:0;padding:0;list-style:none;}
#wrap{padding:10px;}
#topbar{padding:10px 0;border-bottom:1px solid #ccc;text-align:right;}
#topbar button {margin:0;margin-left:5px;outline:none;padding: 4px 16px;box-sizing: border-box;
display:inline-block;border:none;border-radius:3px;text-align:center;cursor:pointer;
font-size:14px;line-height:1.5;background-color:#f0f0f0;color:#223;
}
#topbar button.primary{background-color:#3d97d4;color:#fff;}
#topbar button:hover{background-color:#207ab7;color:#fff;}
#topbar button.removeall{float:left}
#file_list {display:grid;grid-gap:10px;grid-template-columns:repeat(auto-fill,minmax(160px,1fr));padding-top:10px;}
#file_list:empty:after{content:'可以直接拖拽文件到这里';color:#777;font-size:0.8em;}
#file_list li{position:relative;display:block;vertical-align:top;padding:5px 5px;border-radius:5px;}
#file_list li.up-over {}
#file_list li.up-now {}
#file_list li.up-now:after{content:'';position:absolute;top:0;left:0;display:block;width:100%;height:100%;background:rgba(255,255,255,0.8) url(loading.gif) center center no-repeat;border-radius:5px;z-index:999;}
#file_list li:hover{background-color:#ddd;}
#file_list li .picbox {display:flex;flex:0 0 auto;justify-content:center;overflow:hidden;position:relative;width:100%;padding-top:100%;align-items:center;}
#file_list li .picbox img {display:block;max-width:100%;max-height:100%;position:absolute;
top:50%;left:50%;transform:translateX(-50%) translateY(-50%);}
#file_list li.up-over .picbox:after{content:url('data:image/svg+xml;%20charset=utf8,%3Csvg%20viewBox%3D%220%200%201024%201024%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M512%200C229.376%200%200%20229.376%200%20512s229.376%20512%20512%20512%20512-229.376%20512-512S794.624%200%20512%200z%22%20fill%3D%22%234AC711%22%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M855.552%20394.752l-358.4%20358.4a50.9952%2050.9952%200%200%201-72.192%200l-204.8-204.8c-18.944-19.968-18.944-51.2%200-71.168a50.5344%2050.5344%200%200%201%2072.192-1.024L460.8%20644.608l322.048-322.048c19.968-18.944%2051.2-18.944%2071.168%200%2020.48%2019.456%2020.992%2051.712%201.536%2072.192z%22%20fill%3D%22%23FFFFFF%22%3E%3C%2Fpath%3E%3C%2Fsvg%3E');position:absolute;bottom:2px;right:2px;z-index:9;}
#file_list li .tools {display:none;position:absolute;bottom:5px;right:5px;z-index:99;}
#file_list li:hover .tools {display:block;}
#file_list li .tools .remove{cursor:pointer;}
#file_list li .tools .remove:after{content:url('data:image/svg+xml;%20charset=utf8,%3Csvg%20width=%2224%22%20height=%2224%22%20viewBox=%220%200%2024%2024%22%20xmlns=%22http://www.w3.org/2000/svg%22%3E%3Cpath%20d=%22M17%206h3a1%201%200%200%201%200%202h-1v11a3%203%200%200%201-3%203H8a3%203%200%200%201-3-3V8H4a1%201%200%201%201%200-2h3V5a3%203%200%200%201%203-3h4a3%203%200%200%201%203%203v1zm-2%200V5a1%201%200%200%200-1-1h-4a1%201%200%200%200-1%201v1h6zm2%202H7v11a1%201%200%200%200%201%201h8a1%201%200%200%200%201-1V8zm-8%203a1%201%200%200%201%202%200v6a1%201%200%200%201-2%200v-6zm4%200a1%201%200%200%201%202%200v6a1%201%200%200%201-2%200v-6z%22%3E%3C/path%3E%3C/svg%3E');}
#file_list li .namebox {font-size:14px;line-height:20px;max-height:40px;overflow:hidden;padding:5px 10px;text-align:center;display:flex;justify-content:center;align-items:flex-start;}
#file_list li .namebox span{word-break:break-all;vertical-align:top;}
body{margin:0;line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff}
ul{margin:0;padding:0;list-style:none}
button+button{margin-left:10px}
#wrap{padding:10px}
#topbar{padding:10px 0;border-bottom:1px solid #ccc;text-align:right}
#topbar button{display:inline-block;border:0;padding:.25rem .5rem;line-height:1.5;font-size:12px;color:#fff;background:#28a745;border-color:#28a745;border-radius:.25rem;transition:all .6s;text-align:center}
.topbar button+.topbar button{margin-left:10px}
#topbar button:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5);outline:none}
#file_list{display:grid;grid-gap:10px;grid-template-columns:repeat(auto-fill,minmax(160px,1fr));padding-top:10px}
#file_list:empty:after{content:'可以直接拖拽文件到这里。'}
#file_list li{position:relative;display:block;vertical-align:top;padding:10px;border-radius:.25rem}
#file_list li.up-now:after{content:'';position:absolute;top:0;left:0;display:block;width:100%;height:100%;background:rgba(255,255,255,0.8) url(loading.gif) center center no-repeat;border-radius:.25rem;z-index:999}
#file_list li:hover{background:#f2f2f2}
#file_list li .picbox{display:flex;flex:0 0 auto;justify-content:center;overflow:hidden;position:relative;width:100%;padding-top:90%;align-items:center}
#file_list li .picbox img{display:block;max-width:100%;max-height:100%;position:absolute;top:50%;left:50%;transform:translateX(-50%) translateY(-50%);border-radius:.25rem}
#file_list li .namebox{padding:10px;display:flex;justify-content:center;align-items:flex-start}
#file_list li.up-over .picbox:after{content:url(data:image/svg+xml;%20charset=utf8,%3Csvg%20viewBox%3D%220%200%201024%201024%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M512%200C229.376%200%200%20229.376%200%20512s229.376%20512%20512%20512%20512-229.376%20512-512S794.624%200%20512%200z%22%20fill%3D%22%234AC711%22%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M855.552%20394.752l-358.4%20358.4a50.9952%2050.9952%200%200%201-72.192%200l-204.8-204.8c-18.944-19.968-18.944-51.2%200-71.168a50.5344%2050.5344%200%200%201%2072.192-1.024L460.8%20644.608l322.048-322.048c19.968-18.944%2051.2-18.944%2071.168%200%2020.48%2019.456%2020.992%2051.712%201.536%2072.192z%22%20fill%3D%22%23FFFFFF%22%3E%3C%2Fpath%3E%3C%2Fsvg%3E);position:absolute;bottom:10px;right:0;z-index:9}
#file_list li .tools{display:none;position:absolute;bottom:12px;right:10px;z-index:99}
#file_list li:hover .tools{display:block}
#file_list li .tools .remove{cursor:pointer}
#file_list li .tools .remove:after{content:url(data:image/svg+xml;%20charset=utf8,%3Csvg%20width=%2224%22%20height=%2224%22%20viewBox=%220%200%2024%2024%22%20xmlns=%22http://www.w3.org/2000/svg%22%3E%3Cpath%20d=%22M17%206h3a1%201%200%200%201%200%202h-1v11a3%203%200%200%201-3%203H8a3%203%200%200%201-3-3V8H4a1%201%200%201%201%200-2h3V5a3%203%200%200%201%203-3h4a3%203%200%200%201%203%203v1zm-2%200V5a1%201%200%200%200-1-1h-4a1%201%200%200%200-1%201v1h6zm2%202H7v11a1%201%200%200%200%201%201h8a1%201%200%200%200%201-1V8zm-8%203a1%201%200%200%201%202%200v6a1%201%200%200%201-2%200v-6zm4%200a1%201%200%200%201%202%200v6a1%201%200%200%201-2%200v-6z%22%3E%3C/path%3E%3C/svg%3E)}
</style>

</head>
<body>
<div id="wrap">
<div id="topbar"><label><input type="checkbox" name="isWater" id="isWater" <?php if ($photo_markup == '1') echo "checked"; ?>>是否水印</label><button class="addfile primary">+ 添加文件</button><button class="upall primary">全部上传</button><button class="removeall">清空列表</button></div>
<div id="topbar">
<label><input type="checkbox" name="isWater" id="isWater" <?php if ($photo_markup == '1') echo "checked"; ?>>&nbsp;是否水印&nbsp;</label>
<button class="addfile">添加文件</button>
<button class="upall">全部上传</button>
<button class="removeall">清空列表</button>
</div>
<ul id="file_list"></ul>
</div>

<script>
// var editor=parent.tinymce.activeEditor;
// var axupimgs=parent.axupimgs;
var axupimgs={};
axupimgs.res = []; //存放本地文件的数组
axupimgs.res = [];//存放本地文件的数组
var blobInfo = {file:null}
blobInfo.blob = function(){return this.file;}
var upload_handler = async(blobInfo, succFun, failFun)=>{
@@ -66,7 +60,6 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
} else {
// formData.append('needwatermark', 0);
}

let res = await fetch('select_images_post.php', {
method: 'POST',
body: formData
@@ -75,14 +68,12 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
succFun(data.url);
};
var upload_base_path = axupimgs.images_upload_base_path;

//为列表添加排序
function reSort(){
document.querySelectorAll('#file_list li').forEach((el,i)=>{
el.setAttribute('data-num',i);
});
}

function addList(files){
var files_sum = files.length;
var vDom = document.createDocumentFragment();
@@ -99,8 +90,6 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
document.querySelector('#file_list').appendChild(vDom);
//reSort();
}


//清空列表
document.querySelector('#topbar .removeall').addEventListener('click',()=>{
axupimgs.res=[]
@@ -134,7 +123,6 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
}
if(files.length>0){ addList(files) }
});

//添加文件
document.querySelector('#topbar .addfile').addEventListener('click',()=>{
var input = document.createElement('input');
@@ -147,19 +135,17 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
addList(files);
}
});

var file_i = 0;

function upAllFiles(n){
var len = axupimgs.res.length;
file_i = n;
if(len == n){
file_i=0;
document.querySelector('#topbar .upall').innerText='全部上传';
// 返回
//返回
console.log(axupimgs.res);
axupimgs.res.forEach((v,k)=>{
// window.opener.CKEDITOR.tools.callFunction(k, v);
//window.opener.CKEDITOR.tools.callFunction(k, v);
let addonHTML = `<img src='${v.url}'/>`;
window.opener.CKEDITOR.instances["<?php echo $f ?>"].insertHtml(addonHTML);
})
@@ -169,18 +155,16 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
if( axupimgs.res[n].url!='' ){
n++;
upAllFiles(n)
}else{
} else {
blobInfo.file=axupimgs.res[n].file;
blobInfo.isWater = document.querySelector('#isWater').checked;

upload_handler(blobInfo,function(url){
if(upload_base_path){
if(upload_base_path.slice(-1)=='/' && url.substr(0,1)=='/' ){
url = upload_base_path + url.slice(1);
}else if(upload_base_path.slice(-1)!='/' && url.substr(0,1)!='/' ){
url = upload_base_path + '/' + url;
}else{
} else {
url = upload_base_path + url;
}
}
@@ -198,10 +182,8 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
});
alert(err);
});
}
}
}

document.querySelector('#topbar .upall').addEventListener('click',(e)=>{
if(e.target.innerText!='全部上传'){return false;}
if(axupimgs.res.length>0){
@@ -212,7 +194,6 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
upAllFiles(0);
}
});

var observ_flist = new MutationObserver( (muList,observe)=>{
if(muList[0].addedNodes.length>0){
muList[0].addedNodes.forEach((el)=>{
@@ -228,7 +209,6 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
reSort();
});
observ_flist.observe(document.querySelector('#file_list'),{childList:true});

</script>
</body>
</html>
</html>

+ 1
- 1
src/include/arc.archives.class.php View File

@@ -1,5 +1,5 @@
<?php
if (!defined('DEDEINC')) exit("dedebiz");
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 文档类
*


+ 2
- 1
src/include/arc.freelist.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 自由列表类
*


+ 2
- 1
src/include/arc.listview.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 文档列表类
*


+ 2
- 1
src/include/arc.partview.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 视图类
*


+ 2
- 1
src/include/arc.rssview.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* RSS视图类
*


+ 2
- 1
src/include/arc.searchview.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 搜索视图类
*


+ 2
- 1
src/include/arc.sglistview.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 单表模型列表视图类
*


+ 2
- 1
src/include/arc.sgpage.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 单表模型视图类
*


+ 2
- 1
src/include/arc.specview.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 专题视图类
*


+ 2
- 1
src/include/arc.taglist.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* Tag列表类
*


+ 1
- 1
src/include/autoload.inc.php View File

@@ -1,5 +1,5 @@
<?php
if(!defined('DEDEINC')) exit("dedebiz");
if (!defined('DEDEINC')) exit('dedebiz');
/**
* @version $Id: autoload.inc.php 1 17:44 2020-09-22 tianya $
* @package DedeBIZ.Libraries


+ 1
- 1
src/include/autoload7.inc.php View File

@@ -1,5 +1,5 @@
<?php
if(!defined('DEDEINC')) exit("dedebiz");
if (!defined('DEDEINC')) exit('dedebiz');
/**
* @version $Id: autoload7.inc.php 1 17:44 2020-09-22 tianya $
* @package DedeBIZ.Libraries


+ 2
- 1
src/include/channelunit.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 频道模型单元类
* @version $Id: channelunit.class.php 2 17:32 2010年7月6日Z tianya $


+ 2
- 1
src/include/channelunit.func.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 栏目小助手,本文件仅做一个映射
*


+ 2
- 1
src/include/customfields.func.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 系统核心函数存放文件
* @version $Id: customfields.func.php 2 20:50 2010年7月7日Z tianya $


+ 2
- 1
src/include/dedebiz.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
// Copyright 2020 The DedeBiz Authors. All rights reserved.
// license that can be found in the LICENSE file.



+ 2
- 1
src/include/dedecollection.func.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 采集小助手
*


+ 2
- 1
src/include/dedehttpdown.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 织梦HTTP下载类
*


+ 2
- 1
src/include/dedemodule.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 织梦模块类
*


+ 2
- 1
src/include/dedetag.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* Dede织梦模板类
*


+ 2
- 1
src/include/dedetemplate.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 模板引擎文件
*


+ 2
- 1
src/include/dedevote.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 投票类
*


+ 2
- 1
src/include/diyform.cls.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 自定义表单解析类
*


+ 2
- 1
src/include/downmix.inc.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 防采集混淆字符串
*


+ 2
- 1
src/include/enums.func.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 联动菜单类
*


+ 2
- 1
src/include/filter.inc.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 过滤核心处理文件
*


+ 2
- 1
src/include/helpers/archive.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 文档小助手
*


+ 2
- 1
src/include/helpers/cache.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 缓存小助手,支持文件和memcache
*


+ 2
- 1
src/include/helpers/channelunit.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 文档小助手
*


+ 2
- 1
src/include/helpers/charset.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* DedeBIZV6中用到的字符编码转换的小助手函数
*


+ 2
- 1
src/include/helpers/cookie.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* Cookie处理小助手
*


+ 2
- 1
src/include/helpers/debug.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 验证小助手
*


+ 2
- 1
src/include/helpers/extend.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 扩展小助手
*


+ 2
- 1
src/include/helpers/file.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 文件处理小助手
*


+ 2
- 1
src/include/helpers/filter.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 过滤小助手
*


+ 2
- 1
src/include/helpers/image.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 图像处理相关函数
*


+ 2
- 1
src/include/helpers/string.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 字符串小助手
*


+ 2
- 1
src/include/helpers/test.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 仅用于测试
*


+ 2
- 1
src/include/helpers/time.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 时间戳小助手
*


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

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 上传处理小助手
*


+ 2
- 1
src/include/helpers/util.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 核心小助手
*


+ 2
- 1
src/include/helpers/validate.helper.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 验证小助手
*


+ 2
- 1
src/include/image.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 图像处理类
*


+ 2
- 1
src/include/image.func.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 图像处理相关函数
*


+ 5
- 36
src/include/inc/inc_fun_funAdmin.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 管理员后台基本函数
*
@@ -8,7 +9,6 @@
* @license https://www.dedebiz.com/license
* @link https://www.dedebiz.com
*/
/**
* 获取拼音信息
*
@@ -74,11 +74,8 @@ function SpGetPinyin($str, $ishead = 0, $isclose = 1)
unset($pinyins);
}
}
return $restr;
}
/**
* 创建目录
*
@@ -119,10 +116,9 @@ function SpCreateDir($spath)
CloseFtp();
return true;
}
function jsScript($js)
{
$out = "<script type=\"text/javascript\">";
$out = "<script>";
$out .= "//<![CDATA[\n";
$out .= $js;
$out .= "\n//]]>";
@@ -130,7 +126,6 @@ function jsScript($js)
return $out;
}
/**
* 获取编辑器
*
@@ -174,44 +169,19 @@ function SpGetEditor($fname, $fvalue, $nheight = "350", $etype = "Basic", $gtype
$addConfig = "";
if (defined("DEDEADMIN")) {
$addConfig = ",{allowedContent:true,filebrowserImageUploadUrl:'./dialog/select_images_post.php',filebrowserUploadUrl:'./dialog/select_media_post.php?ck=1',extraPlugins:'html5video,dedepagebreak,ddfilebrowser,mimage,textindent'}";
//$addConfig = ",{filebrowserImageUploadUrl:'./dialog/select_images_post.php'}";
}
$code = <<<EOT
<script src="{$GLOBALS['cfg_static_dir']}/ckeditor/ckeditor.js"></script>
<textarea id="{$fname}" name="{$fname}" rows="8" cols="60">{$fvalue}</textarea>
<script>
var editor = CKEDITOR.replace('{$fname}'{$addConfig});
</script>
<script>var editor = CKEDITOR.replace('{$fname}'{$addConfig});</script>
EOT;
if ($gtype == "print") {
echo $code;
} else {
return $code;
}
} else {
/*
//------------------------------------------------------------------------
//当前版本,暂时取消dedehtml编辑器的支持
//------------------------------------------------------------------------
require_once(DEDEINC.'/htmledit/dede_editor.php');
$ded = new DedeEditor($fname);
$ded->BasePath = $GLOBALS['cfg_cmspath'].'/include/htmledit/' ;
$ded->Width = '100%' ;
$ded->Height = $nheight ;
$ded->ToolbarSet = strtolower($etype);
$ded->Value = $fvalue ;
if($gtype=="print")
{
$ded->Create();
}
else
{
return $ded->CreateHtml();
}
*/
}
}
/**
* 获取更新信息
*
@@ -236,7 +206,6 @@ function SpGetNewInfo()
$query = "SELECT COUNT(*) AS dd FROM `#@__arctiny` ";
$row2 = $dsql->GetOne($query);
if ($row2) $add_query .= "&acount={$row2['dd']}";
$offUrl = DEDEBIZURL."/version?version={$cfg_version_detail}&formurl={$nurl}&phpver={$phpv}&os={$sp_os}&mysqlver={$mysql_ver}{$add_query}";
return $offUrl;
}
}

+ 1
- 5
src/include/inc/inc_fun_funString.php View File

@@ -1,9 +1,5 @@
<?php
if(!defined('DEDEINC'))
{
exit("dedebiz");
}
if (!defined('DEDEINC')) exit('dedebiz');
function SpHtml2Text($str)
{
$str = preg_replace("/<sty(.*)\\/style>|<scr(.*)\\/script>|<!--(.*)-->/isU","",$str);


+ 2
- 1
src/include/memberlogin.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 会员登录类
*


+ 1
- 1
src/include/oxwindow.class.php View File

@@ -1,5 +1,5 @@
<?php
if (!defined('DEDEINC')) exit("dedebiz");
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 提示窗口对话框类
*


+ 2
- 1
src/include/sitemap.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 网站地图(sitemap类)
*


+ 2
- 1
src/include/taglib/channel/specialtopic.lib.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 专题主题调用标签
*


+ 2
- 1
src/include/tpllib/plus_memberlist.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
//orderby = logintime(login new) or mid(register new)
/**
* 动态模板memberlist标签


+ 2
- 1
src/include/typelink.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 栏目连接
*


+ 2
- 1
src/include/typeunit.class.admin.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 栏目单元,主要用户管理后台管理处
*


+ 2
- 1
src/include/typeunit.class.menu.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit("dedebiz");
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 栏目单元,主要用户管理后台管理菜单处
*


+ 2
- 1
src/include/typeunit.class.selector.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 栏目单元,选择框
*


+ 2
- 1
src/include/userlogin.class.php View File

@@ -1,4 +1,5 @@
<?php if (!defined('DEDEINC')) exit('dedebiz');
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* 管理员登录类
*


+ 2
- 2
src/member/index_do.php View File

@@ -1,7 +1,7 @@
<?php
/**
* @version $Id: index_do.php 1 8:24 2010年7月9日Z tianya $
* @package DedeBIZ.Member
* @version $Id: index_do.php 1 8:24 2010年7月9日Z tianya $
* @package DedeBIZ.Member
* @copyright Copyright (c) 2022, DedeBIZ.COM
* @license https://www.dedebiz.com/license
* @link https://www.dedebiz.com


Loading…
Cancel
Save