";
$rmsg .= "
\");";
$rmsg .= "document.write(\"
\");";
diff --git a/src/include/common.inc.php b/src/include/common.inc.php
index a189c99d..25221c83 100755
--- a/src/include/common.inc.php
+++ b/src/include/common.inc.php
@@ -1,5 +1,4 @@
=')) {
if (!function_exists('session_register')) {
function session_register()
@@ -62,12 +53,10 @@ if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
}
}
}
-
//是否启用mb_substr替换cn_substr来提高效率
$cfg_is_mb = $cfg_is_iconv = FALSE;
if (function_exists('mb_substr')) $cfg_is_mb = TRUE;
if (function_exists('iconv_substr')) $cfg_is_iconv = TRUE;
-
function _RunMagicQuotes(&$svar)
{
if (function_exists("get_magic_quotes_gpc") && !@get_magic_quotes_gpc()) {
@@ -82,9 +71,8 @@ function _RunMagicQuotes(&$svar)
}
return $svar;
}
-
if (!defined('DEDEREQUEST')) {
- //检查和注册外部提交的变量 (2011.8.10 修改登录时相关过滤)
+ //检查和注册外部提交的变量（2011.8.10 修改登录时相关过滤）
function CheckRequest(&$val)
{
if (is_array($val)) {
@@ -99,11 +87,9 @@ if (!defined('DEDEREQUEST')) {
}
}
}
-
//var_dump($_REQUEST);exit;
CheckRequest($_REQUEST);
CheckRequest($_COOKIE);
-
foreach (array('_GET', '_POST', '_COOKIE') as $_request) {
foreach ($$_request as $_k => $_v) {
if ($_k == 'nvarname') ${$_k} = $_v;
@@ -111,7 +97,6 @@ if (!defined('DEDEREQUEST')) {
}
}
}
-
//系统相关变量检测
if (!isset($needFilter)) {
$needFilter = false;
@@ -122,47 +107,37 @@ $isSafeMode = @ini_get("safe_mode");
if (preg_match('/windows/i', @getenv('OS'))) {
$isSafeMode = false;
}
-
//系统配置参数
require_once(DEDEDATA."/config.cache.inc.php");
-
//Session保存路径
$sessSaveHandler = @ini_get("session.save_handler");
if ($sessSaveHandler !== "files") {
@ini_set("session.save_handler", "files");
}
-
$enkey = substr(md5(substr($cfg_cookie_encode, 0, 5)), 0, 10);
$sessSavePath = DEDEDATA."/sessions_{$enkey}";
if (!is_dir($sessSavePath)) mkdir($sessSavePath);
-
if (is_writeable($sessSavePath) && is_readable($sessSavePath)) {
session_save_path($sessSavePath);
}
-
//转换上传的文件相关的变量及安全处理、并引用前台通用的上传函数
if ($_FILES) {
require_once(DEDEINC.'/uploadsafe.inc.php');
}
-
//数据库配置文件
require_once(DEDEDATA.'/common.inc.php');
-
if (!isset($cfg_dbtype)) {
$cfg_dbtype = 'mysql';
}
-
//载入系统验证安全配置
if (file_exists(DEDEDATA.'/safe/inc_safe_config.php')) {
require_once(DEDEDATA.'/safe/inc_safe_config.php');
if (!empty($safe_faqs)) $safefaqs = unserialize($safe_faqs);
}
-
//Session跨域设置
if (!empty($cfg_domain_cookie)) {
@session_set_cookie_params(0, '/', $cfg_domain_cookie);
}
-
//php5.1版本以上时区设置
//由于这个函数对于是php5.1以下版本并无意义，因此实际上的时间调用，应该用MyDate函数调用
if (PHP_VERSION > '5.1') {
@@ -170,15 +145,12 @@ if (PHP_VERSION > '5.1') {
@date_default_timezone_set('Etc/GMT'.$time51);
}
$cfg_isUrlOpen = @ini_get("allow_url_fopen");
-
//用户访问的网站host
if (PHP_SAPI === 'cli') {
$cfg_clihost = 'https://www.dedebiz.com';
} else {
$cfg_clihost = 'http://'.$_SERVER['HTTP_HOST'];
}
-
-
//站点根目录
$cfg_basedir = preg_replace('#'.$cfg_cmspath.'\/include$#i', '', DEDEINC);
if ($cfg_multi_site == 'Y') {
@@ -186,95 +158,72 @@ if ($cfg_multi_site == 'Y') {
} else {
$cfg_mainsite = '';
}
-
//模板的存放目录
$cfg_templets_dir = $cfg_cmspath.'/templets';
$cfg_templeturl = $cfg_mainsite.$cfg_templets_dir;
$cfg_templets_skin = empty($cfg_df_style) ? $cfg_mainsite.$cfg_templets_dir."/default" : $cfg_mainsite.$cfg_templets_dir."/$cfg_df_style";
-
//cms安装目录的网址
$cfg_cmsurl = $cfg_mainsite.$cfg_cmspath;
-
//插件目录，这个目录是用于存放计数器、投票、评论等程序的必要动态程序
$cfg_plus_dir = $cfg_cmspath.'/plus';
$cfg_phpurl = $cfg_mainsite.$cfg_plus_dir;
-
$cfg_static_dir = $cfg_cmspath.'/static';
$cfg_staticurl = $cfg_mainsite.$cfg_static_dir;
-
$cfg_mobile_dir = $cfg_cmspath.'/m';
$cfg_mobileurl = $cfg_mainsite.$cfg_mobile_dir;
-
$cfg_data_dir = $cfg_cmspath.'/data';
$cfg_dataurl = $cfg_mainsite.$cfg_data_dir;
-
//会员目录
$cfg_member_dir = $cfg_cmspath.'/member';
$cfg_memberurl = $cfg_mainsite.$cfg_member_dir;
-
//专题列表的存放路径
$cfg_special = $cfg_cmspath.'/special';
$cfg_specialurl = $cfg_mainsite.$cfg_special;
-
//附件目录
$cfg_medias_dir = $cfg_cmspath.$cfg_medias_dir;
$cfg_mediasurl = $cfg_mainsite.$cfg_medias_dir;
-
//上传的普通图片的路径,建议按默认
$cfg_image_dir = $cfg_medias_dir.'/allimg';
-
//上传的缩略图
$ddcfg_image_dir = $cfg_medias_dir.'/litimg';
-
//用户投稿图片存放目录
$cfg_user_dir = $cfg_medias_dir.'/userup';
-
//上传的软件目录
$cfg_soft_dir = $cfg_medias_dir.'/soft';
-
//上传的多媒体文件目录
$cfg_other_medias = $cfg_medias_dir.'/media';
-
//软件摘要信息，****请不要删除本项**** 否则系统无法正确接收系统漏洞或升级信息
$cfg_version = 'V6';
-$cfg_version_detail = '6.0.3'; // 详细版本号
+$cfg_version_detail = '6.0.4'; //详细版本号
$cfg_soft_lang = 'utf-8';
$cfg_soft_public = 'base';
-
$cfg_softname = '织梦内容管理系统';
-$cfg_soft_enname = 'DedeBIZ';
+$cfg_soft_enname = 'DedeCMSV6';
$cfg_soft_devteam = 'DedeBIZ';
-
//文档的默认命名规则
$art_shortname = $cfg_df_ext = '.html';
-$cfg_df_namerule = '{typedir}/{Y}/{M}{D}/{aid}'.$cfg_df_ext;
-
+$cfg_df_namerule = '{typedir}/{aid}'.$cfg_df_ext;
//新建目录的权限，如果你使用别的属性，本程不保证程序能顺利在Linux或Unix系统运行
if (isset($cfg_ftp_mkdir) && $cfg_ftp_mkdir == 'Y') {
$cfg_dir_purview = '0755';
} else {
$cfg_dir_purview = 0755;
}
-
//会员是否使用精简模式（已禁用）
$cfg_mb_lit = 'N';
-
//特殊全局变量
$_sys_globals['curfile'] = '';
$_sys_globals['typeid'] = 0;
$_sys_globals['typename'] = '';
$_sys_globals['aid'] = 0;
-
if (empty($cfg_addon_savetype)) {
$cfg_addon_savetype = 'Ymd';
}
if ($cfg_sendmail_bysmtp == 'Y' && !empty($cfg_smtp_usermail)) {
$cfg_adminemail = $cfg_smtp_usermail;
}
-
-// DedeBIZ商业化组件
+//DedeBIZ商业化组件
require_once(DEDEINC.'/dedebiz.class.php');
-
//对全局分页传递参数进行过滤
if (isset($GLOBALS['PageNo'])) {
$GLOBALS['PageNo'] = intval($GLOBALS['PageNo']);
@@ -282,9 +231,7 @@ if (isset($GLOBALS['PageNo'])) {
if (isset($GLOBALS['TotalResult'])) {
$GLOBALS['TotalResult'] = intval($GLOBALS['TotalResult']);
}
-
-// ------------------------------------------------------------------------
-// 设定缓存配置信息
+//设定缓存配置信息
if ($cfg_memcache_enable == 'Y') {
$cache_helper_config = array();
$cache_helper_config['memcache']['is_mc_enable'] = $GLOBALS["cfg_memcache_enable"];
@@ -294,35 +241,29 @@ if ($cfg_memcache_enable == 'Y') {
);
$cache_helper_config['memcache']['mc_cache_time'] = $GLOBALS["cfg_puccache_time"];
}
-
if (!isset($cfg_NotPrintHead)) {
if (PHP_SAPI != 'cli') {
header("Content-Type: text/html; charset={$cfg_soft_lang}");
}
}
-
//自动加载类库处理
if (version_compare(PHP_VERSION, '7.2.0', '>=')) {
require_once(DEDEINC.'/autoload7.inc.php');
} else {
require_once(DEDEINC.'/autoload.inc.php');
}
-
$cfg_biz_helpUrl = DEDEBIZURL."/help";
$cfg_biz_gitUrl = DEDEBIZURL."/git";
$cfg_biz_dedebizUrl = DEDEBIZURL;
-
//引入数据库类
if ($GLOBALS['cfg_dbtype'] == 'mysql' || $GLOBALS['cfg_dbtype'] == 'mysqli') {
require_once(DEDEINC.'/dedesqli.class.php');
} else {
require_once(DEDEINC.'/dedesqlite.class.php');
}
-
//全局常用函数
require_once(DEDEINC.'/common.func.php');
-
//载入小助手配置,并对其进行默认初始化
$cfg_helper_autoload = array(
'charset', /* 编码小助手 */
@@ -339,5 +280,5 @@ $cfg_helper_autoload = array(
'upload', /* 上传小助手 */
'extend', /* 扩展小助手 */
);
-// 初始化小助手
-helper($cfg_helper_autoload);
+//初始化小助手
+helper($cfg_helper_autoload);
\ No newline at end of file
diff --git a/src/static/ckeditor/contents.css b/src/static/ckeditor/contents.css
index ed9d9a10..34a80317 100755
--- a/src/static/ckeditor/contents.css
+++ b/src/static/ckeditor/contents.css
@@ -1,29 +1 @@
-body{margin:20px;line-height:1.5;font-family:sans-serif,Arial,Verdana,"Trebuchet MS","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:14px;color:#333;background-color:#fff}
-blockquote{font-style:italic;font-family:Georgia,Times,"Times New Roman",serif;padding:2px 0;border-style:solid;border-color:#ccc;border-width:0}
-a{color:#0782C1}
-ol,ul,dl{padding:0 40px}
-h1,h2,h3,h4,h5,h6{font-weight:normal;line-height:1.5}
-hr{border:0px;border-top:1px solid #ccc}
-pre{white-space:pre-wrap;word-wrap:break-word;-moz-tab-size:4;tab-size:4}
-span[lang]{font-style:italic}
-figure{text-align:center;outline:solid 1px #ccc;background:rgba(0,0,0,0.05);padding:10px;margin:10px 20px;display:inline-block}
-figure > figcaption{text-align:center;display:block}
-img{border-radius:.2rem}
-a > img{padding:1px;margin:1px;border:none;outline:1px solid #0782C1}
-img.right{border:1px solid #ccc;float:right;margin-left:15px;padding:5px}
-img.left{border:1px solid #ccc;float:left;margin-right:15px;padding:5px}
-.marker{background-color:Yellow}
-.cke_editable{font-size:14px;word-wrap:break-word}
-.cke_contents_ltr blockquote{padding-left:20px;padding-right:8px;border-left-width:5px}
-.cke_contents_rtl blockquote{padding-left:8px;padding-right:20px;border-right-width:5px}
-.code-featured{border:5px solid red}
-.math-featured{padding:20px;box-shadow:0 0 2px rgba(200,0,0,1);background-color:rgba(255,0,0,0.05);margin:10px}
-.image-clean{border:0;background:none;padding:0}
-.image-clean > figcaption{font-size:.9em;text-align:right}
-.image-grayscale{background-color:white;color:#666}
-.image-grayscale img,img.image-grayscale{filter:grayscale(100%)}
-.embed-240p{max-width:426px;max-height:240px;margin:0 auto}
-.embed-360p{max-width:640px;max-height:360px;margin:0 auto}
-.embed-480p{max-width:854px;max-height:480px;margin:0 auto}
-.embed-720p{max-width:1280px;max-height:720px;margin:0 auto}
-.embed-1080p{max-width:1920px;max-height:1080px;margin:0 auto}
\ No newline at end of file
+body{margin:20px;line-height:1.5;font-family:sans-serif,Arial,Verdana,"Trebuchet MS","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:14px;color:#333;background-color:#fff}blockquote{font-style:italic;font-family:Georgia,Times,"Times New Roman",serif;padding:2px 0;border-style:solid;border-color:#ccc;border-width:0}a{color:#0782C1}ol,ul,dl{padding:0 40px}h1,h2,h3,h4,h5,h6{font-weight:normal;line-height:1.5}hr{border:0px;border-top:1px solid #ccc}pre{white-space:pre-wrap;word-wrap:break-word;-moz-tab-size:4;tab-size:4}span[lang]{font-style:italic}figure{text-align:center;outline:solid 1px #ccc;background:rgba(0,0,0,0.05);padding:10px;margin:10px 20px;display:inline-block}figure > figcaption{text-align:center;display:block}img{border-radius:.2rem}a > img{padding:1px;margin:1px;border:none;outline:1px solid #0782C1}img.right{border:1px solid #ccc;float:right;margin-left:15px;padding:5px}img.left{border:1px solid #ccc;float:left;margin-right:15px;padding:5px}.marker{background-color:Yellow}.cke_editable{font-size:14px;word-wrap:break-word}.cke_contents_ltr blockquote{padding-left:20px;padding-right:8px;border-left-width:5px}.cke_contents_rtl blockquote{padding-left:8px;padding-right:20px;border-right-width:5px}.code-featured{border:5px solid red}.math-featured{padding:20px;box-shadow:0 0 2px rgba(200,0,0,1);background-color:rgba(255,0,0,0.05);margin:10px}.image-clean{border:0;background:none;padding:0}.image-clean > figcaption{font-size:.9em;text-align:right}.image-grayscale{background-color:white;color:#666}.image-grayscale img,img.image-grayscale{filter:grayscale(100%)}.embed-240p{max-width:426px;max-height:240px;margin:0 auto}.embed-360p{max-width:640px;max-height:360px;margin:0 auto}.embed-480p{max-width:854px;max-height:480px;margin:0 auto}.embed-720p{max-width:1280px;max-height:720px;margin:0 auto}.embed-1080p{max-width:1920px;max-height:1080px;margin:0 auto}
\ No newline at end of file