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

图像bug修复

tags/6.2.0
tianya 2 years ago
parent
a343e44973
commit
006080078c
5 changed files with 19 additions and 8 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +5
    -0
      src/admin/dialog/select_mimages.php
  2. +1
    -1
      src/install/config.cache.inc.php
  3. +4
    -5
      src/install/index.php
  4. +1
    -1
      src/install/sql-dfdata.txt
  5. +8
    -1
      src/system/common.func.php

+ 5
- 0
src/admin/dialog/select_mimages.php View File

@@ -56,6 +56,7 @@ button+button{margin-left:10px}
var file = blobInfo.blob(); var file = blobInfo.blob();
formData = new FormData(); formData = new FormData();
formData.append('upload', file, file.name); formData.append('upload', file, file.name);
formData.append('format', "json");
if (document.querySelector('#isWater').checked) { if (document.querySelector('#isWater').checked) {
formData.append('needwatermark', 1); formData.append('needwatermark', 1);
} else { } else {
@@ -66,6 +67,10 @@ button+button{margin-left:10px}
body: formData body: formData
}); });
let data = await res.json(); let data = await res.json();
if (typeof data.msg !== 'undefined' && data.msg !== '') {
alert(data.msg)
return;
}
succFun(data.url); succFun(data.url);
}; };
var upload_base_path = axupimgs.images_upload_base_path; var upload_base_path = axupimgs.images_upload_base_path;


+ 1
- 1
src/install/config.cache.inc.php View File

@@ -14,7 +14,7 @@ $cfg_medias_dir = '/static';
$cfg_ddimg_width = 400; $cfg_ddimg_width = 400;
$cfg_ddimg_height = 300; $cfg_ddimg_height = 300;
$cfg_domain_cookie = ''; $cfg_domain_cookie = '';
$cfg_imgtype = 'jpg|gif|png';
$cfg_imgtype = 'jpeg|jpg|gif|png|webp|bmp';
$cfg_softtype = 'zip|gz|rar|iso|doc|xsl|ppt|wps'; $cfg_softtype = 'zip|gz|rar|iso|doc|xsl|ppt|wps';
$cfg_mediatype = 'swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov'; $cfg_mediatype = 'swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov';
$cfg_specnote = 10; $cfg_specnote = 10;


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

@@ -183,15 +183,14 @@ else if ($step==2)
$query = preg_replace ('/smallint\(([\d]+)\)/i','INTEGER',$query); $query = preg_replace ('/smallint\(([\d]+)\)/i','INTEGER',$query);
$query = preg_replace('/int\(([\d]+)\)/i','INTEGER',$query); $query = preg_replace('/int\(([\d]+)\)/i','INTEGER',$query);
$query = preg_replace('/auto_increment/i','PRIMARY KEY AUTOINCREMENT',$query); $query = preg_replace('/auto_increment/i','PRIMARY KEY AUTOINCREMENT',$query);
$query = preg_replace('/, KEY(.*?)MyISAM;/','',$query);
$query = preg_replace('/, KEY(.*?);/',');',$query);
$query = preg_replace('/, UNIQUE KEY(.*?);/',');',$query);
$query = preg_replace('/,([\t\s ]+)KEY(.*?)MyISAM;/','',$query);
$query = preg_replace('/,([\t\s ]+)KEY(.*?);/',');',$query);
$query = preg_replace('/,([\t\s ]+)UNIQUE KEY(.*?);/',');',$query);
$query = preg_replace('/set\(([^\)]*?)\)/','varchar',$query); $query = preg_replace('/set\(([^\)]*?)\)/','varchar',$query);
$query = preg_replace('/enum\(([^\)]*?)\)/','varchar',$query); $query = preg_replace('/enum\(([^\)]*?)\)/','varchar',$query);
if ( preg_match("/PRIMARY KEY AUTOINCREMENT/",$query) ) if ( preg_match("/PRIMARY KEY AUTOINCREMENT/",$query) )
{ {
$query = preg_replace('/,([\t\s ]+)PRIMARY KEY \(`([0-9a-zA-Z]+)`\)/i','',$query);
$query = str_replace(', PRIMARY KEY (`id`)','',$query);
$query = preg_replace('/,([\t\s ]+)PRIMARY KEY([\t\s ]+)\(`([0-9a-zA-Z]+)`\)/i','',$query);
} }
$db->exec($query); $db->exec($query);
} else { } else {


+ 1
- 1
src/install/sql-dfdata.txt View File

@@ -3950,7 +3950,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin
('13','cfg_ddimg_width','缩略图默认宽度','3','number','400'), ('13','cfg_ddimg_width','缩略图默认宽度','3','number','400'),
('14','cfg_ddimg_height','缩略图默认高度','3','number','300'), ('14','cfg_ddimg_height','缩略图默认高度','3','number','300'),
('15','cfg_album_width','图集默认显示图片的大小','3','number','800'), ('15','cfg_album_width','图集默认显示图片的大小','3','number','800'),
('16','cfg_imgtype','图片浏览器文件类型','3','string','jpg|gif|png|webp|bmp'),
('16','cfg_imgtype','图片浏览器文件类型','3','string','jpeg|jpg|gif|png|webp|bmp'),
('17','cfg_softtype','允许上传的软件类型','3','bstring','zip|gz|rar|iso|doc|xsl|ppt|wps'), ('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'), ('18','cfg_mediatype','允许的多媒体文件类型','3','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov'),
('19','cfg_specnote','专题的最大节点数','2','number','10'), ('19','cfg_specnote','专题的最大节点数','2','number','10'),


+ 8
- 1
src/system/common.func.php View File

@@ -323,7 +323,14 @@ $arrs2 = array();
*/ */
function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0) function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
{ {
global $cfg_soft_lang, $cfg_cmsurl;
if (strtolower($GLOBALS['format'])==='json') {
echo json_encode(array(
"code"=>0,
"msg"=>$msg,
"gourl"=>$gourl,
));
return;
}
if (empty($GLOBALS['cfg_plus_dir'])) $GLOBALS['cfg_plus_dir'] = '..'; if (empty($GLOBALS['cfg_plus_dir'])) $GLOBALS['cfg_plus_dir'] = '..';
$htmlhead = "<!DOCTYPE html><html><head><meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='IE=Edge,chrome=1'><title>提示信息</title><base target='_self'></head>"; $htmlhead = "<!DOCTYPE html><html><head><meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='IE=Edge,chrome=1'><title>提示信息</title><base target='_self'></head>";
$htmlhead .= "<body><center><script>"; $htmlhead .= "<body><center><script>";


Write Preview
Loading…
Cancel
Save