From b4994afbecb800190206c1c4dc1d457af4a3ce36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Mon, 17 Apr 2023 16:00:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/dialog/config.php | 2 +- src/admin/dialog/select_images.php | 339 +++++++++--------- src/admin/dialog/select_images_post.php | 6 +- src/admin/dialog/select_media.php | 280 +++++++-------- src/admin/dialog/select_mimages.php | 374 ++++++++++---------- src/admin/dialog/select_soft.php | 244 ++++++------- src/admin/dialog/select_soft_post.php | 10 +- src/admin/dialog/select_templets.php | 98 ++--- src/admin/dialog/select_templets_post.php | 6 +- src/admin/file_class.php | 2 +- src/admin/file_manage_control.php | 2 +- src/admin/friendlink_edit.php | 2 +- src/admin/inc/inc_archives_functions.php | 4 +- src/admin/inc/inc_menu_module.php | 2 +- src/admin/makehtml_homepage.php | 2 +- src/admin/media_add.php | 2 +- src/admin/sys_info_mark.php | 2 +- src/admin/templets/action_search.htm | 16 +- src/admin/templets/album_add.htm | 2 +- src/admin/templets/album_edit.htm | 2 +- src/admin/templets/freelist_main.htm | 46 +-- src/admin/templets/search_keywords_main.htm | 28 +- src/admin/templets_one_add.php | 2 +- src/admin/templets_one_edit.php | 2 +- src/system/helpers/upload.helper.php | 30 +- 25 files changed, 746 insertions(+), 759 deletions(-) diff --git a/src/admin/dialog/config.php b/src/admin/dialog/config.php index 90ebd62c..e386279a 100644 --- a/src/admin/dialog/config.php +++ b/src/admin/dialog/config.php @@ -21,7 +21,7 @@ $s_scriptName = $dedeNowurls[0]; $cuserLogin = new userLogin(); if ($cuserLogin->getUserID() <= 0) { if (empty($adminDirHand)) { - ShowMsg("提示：需要输入后台管理目录才能登录
请输入后台管理目录名：
", "javascript:;"); + ShowMsg("

提示：需要输入后台管理目录才能登录

请输入后台管理目录名：
", "javascript:;"); exit(); } $adminDirHand = HtmlReplace($adminDirHand, 1); diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php index a8896e2c..1a801598 100644 --- a/src/admin/dialog/select_images.php +++ b/src/admin/dialog/select_images.php @@ -52,125 +52,60 @@ if (!empty($iseditor)) { ?> - - - - 选择图片 - - - - - - - - - -
-
- -
- - - - - - - - - - - - - - + + + 选择图片 + + + + + + + +
+
+ +
+
-
- " : ''; echo $noeditor;?> - - - - - - - - - - - - - -
-
点击图片预览，再点击图片关闭预览，点击文件名选择图片
预览选择图片文件大小修改时间
+ + + + + + + + + + + + - - - "; - echo $line; - } else if (is_dir("$inpath/$file")) { - if (preg_match("#^_(.*)$#i", $file)) continue; - if (preg_match("#^\.(.*)$#i", $file)) continue; - $line = " - - "; - echo "$line"; - } else if (preg_match("#\.(".$cfg_imgtype.")#i", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(jpg)#i", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $line = " - - - - "; - echo "$line"; + $filetime = filemtime("$inpath/$file"); + $filetime = MyDate("Y-m-d H:i:s", $filetime); + } + if ($file == ".") continue; + else if ($file == "..") { + if ($activepath == "") continue; + $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath); + $line = " + + + "; + echo $line; + } else if (is_dir("$inpath/$file")) { + if (preg_match("#^_(.*)$#i", $file)) continue; + if (preg_match("#^\.(.*)$#i", $file)) continue; + $line = " + + "; + echo "$line"; + } else if (preg_match("#\.(".$cfg_imgtype.")#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(jpg)#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $line = " + + + + "; + echo "$line"; + } + }//End Loop + ?> + +
+
+ " : ''; echo $noeditor;?> + + + + + + + + + + + + + +
+
点击图片预览，再点击图片关闭预览，点击文件名选择图片
选择图片文件大小修改时间
上级目录当前目录：$activepath
$file
- - $file - $filesize KB$filetime
- - $file - $filesize KB$filetime
上级目录当前目录：$activepath
$file
+ + $file + $filesize KB$filetime
+ + $file + $filesize KB$filetime
+
+ + \ No newline at end of file diff --git a/src/admin/dialog/select_images_post.php b/src/admin/dialog/select_images_post.php index b657627b..f5f2dc7c 100644 --- a/src/admin/dialog/select_images_post.php +++ b/src/admin/dialog/select_images_post.php @@ -22,20 +22,20 @@ if (empty($imgfile)) { $imgfile = ''; } if (!is_uploaded_file($imgfile)) { - ShowMsg("您没有选择上传的文件".$imgfile, "-1"); + ShowMsg("您没有选择上传文件".$imgfile, "-1"); exit(); } $CKEditorFuncNum = (isset($CKEditorFuncNum)) ? $CKEditorFuncNum : 1; $imgfile_name = trim(preg_replace("#[ \r\n\t\*\%\\\/\?><\|\":]{1,}#", '', $imgfile_name)); if (!preg_match("#\.(".$cfg_imgtype.")#i", $imgfile_name)) { - ShowMsg("您所上传的图片类型不在许可列表，请修改系统对扩展名限定的配置", "-1"); + ShowMsg("您上传的图片类型错误，请修改系统对扩展名配置", "-1"); exit(); } $nowtme = time(); $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp", "image/webp"); $imgfile_type = strtolower(trim($imgfile_type)); if (!in_array($imgfile_type, $sparr)) { - ShowMsg("上传的图片格式错误，请使用JPEG、GIF、PNG、WBMP格式的其中一种", "-1"); + ShowMsg("您上传的图片格式错误，请使用jpg、png、gif、wbmp格式其中一种", "-1"); exit(); } $mdir = MyDate($cfg_addon_savetype, $nowtme); diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php index 96825038..179ceceb 100644 --- a/src/admin/dialog/select_media.php +++ b/src/admin/dialog/select_media.php @@ -42,60 +42,45 @@ if (!empty($noeditor)) { ?> - - - - 选择多媒体 - - - - - - - -
- - - - - - - - - - + + + 选择多媒体 + + + + + + +
+
-
- - - - - - -
-
点击名称选择文件文件大小最后修改时间
+ + + + + + + + + - - - "; - echo $line; - } else if (is_dir("$inpath/$file")) { - if (preg_match("#^_(.*)$#i", $file)) continue; - if (preg_match("#^\.(.*)$#i", $file)) continue; - $line = " - - "; - echo "$line"; - } else if (preg_match("#\.(swf|fly|fla|flv)#i", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(wmv|avi)#i", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(rm|rmvb|mp3|mp4)#i", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(mp3|wma)#", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $line = " - - - - "; - echo "$line"; - } - }//End Loop - ?> -
+
+ + + + + + +
+
点击名称选择文件文件大小最后修改时间
上级目录当前目录：$activepath
$file
- - $file - $filesize KB$filetime
- - $file - $filesize KB$filetime
- - $file - $filesize KB$filetime
- - $file - $filesize KB$filetime
-
- + $filetime = filemtime("$inpath/$file"); + $filetime = MyDate("Y-m-d H:i:s", $filetime); + } + //判断文件类型并作处理 + if ($file == ".") continue; + else if ($file == "..") { + if ($activepath == "") continue; + $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath); + $line = " + 上级目录 + 当前目录：$activepath + "; + echo $line; + } else if (is_dir("$inpath/$file")) { + if (preg_match("#^_(.*)$#i", $file)) continue; + if (preg_match("#^\.(.*)$#i", $file)) continue; + $line = " + $file + "; + echo "$line"; + } else if (preg_match("#\.(swf|fly|fla|flv)#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $line = " + + + $file + + $filesize KB + $filetime + "; + echo "$line"; + } else if (preg_match("#\.(wmv|avi)#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $line = " + + + $file + + $filesize KB + $filetime + "; + echo "$line"; + } else if (preg_match("#\.(rm|rmvb|mp3|mp4)#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $line = " + + + $file + + $filesize KB + $filetime + "; + echo "$line"; + } else if (preg_match("#\.(mp3|wma)#", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $line = " + + + $file + + $filesize KB + $filetime + "; + echo "$line"; + } + }//End Loop + ?> + + + + \ No newline at end of file diff --git a/src/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php index dddb956a..715e1609 100644 --- a/src/admin/dialog/select_mimages.php +++ b/src/admin/dialog/select_mimages.php @@ -4,201 +4,201 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php'); ?> - - - - - - - -插入多图 - - - - -
-
- - - - + + + + + + + + 插入多图 + + + + +
+
+ + + + +
+
    - -
    - - + e.target.innerText='上传中'; + upAllFiles(0); + } + }); + var observ_flist = new MutationObserver( (muList,observe)=>{ + if (muList[0].addedNodes.length>0){ + muList[0].addedNodes.forEach((el)=>{ + el.querySelector('.remove').addEventListener('click',(e)=>{ + var li = e.target.parentNode.parentNode; + var n = li.getAttribute('data-num'); + var el = document.querySelectorAll('#file_list li')[n]; + el.parentNode.removeChild(el); + axupimgs.res.splice(n,1); + }); + }); + } + reSort(); + }); + observ_flist.observe(document.querySelector('#file_list'),{childList:true}); + + \ No newline at end of file diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index 82b0ab19..8ee873ce 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -41,129 +41,129 @@ if (!empty($noeditor)) { ?> - - - - 选择软件 - - - - - - - -
    - - - - - - - - - - - - - - - - \r\n"; - echo $line; - } else if (is_dir("$inpath/$file")) { - if (preg_match("#^_(.*)$#i", $file)) continue; - if (preg_match("#^\.(.*)$#i", $file)) continue; - $line = " - - "; - echo "$line"; - } else if (preg_match("#\.(zip|rar|tgr.gz)#i", $file)) { - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - $line = " - - - - "; - echo "$line"; - } else { - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ''; - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - $line = " - - - - "; - echo "$line"; - } - }//End Loop - ?> -
    -
    - - - - - - -
    -
    点击选择文件，红色字样的为刚上传的文件
    选择文件文件大小修改时间
    上级目录当前目录：$activepath
    $file
    - - $file - $filesize KB$filetime
    - - $file - $filesize KB$filetime
    -
    - + + \ No newline at end of file diff --git a/src/admin/dialog/select_soft_post.php b/src/admin/dialog/select_soft_post.php index 40adc664..2100dd5d 100644 --- a/src/admin/dialog/select_soft_post.php +++ b/src/admin/dialog/select_soft_post.php @@ -19,7 +19,7 @@ $newname = (empty($newname) ? '' : preg_replace("#[\\ \"\*\?\t\r\n<>':\/|]#", "" $uploadfile = isset($imgfile) && empty($uploadfile) ? $imgfile : $uploadfile; $uploadfile_name = isset($imgfile_name) && empty($uploadfile_name) ? $imgfile_name : $uploadfile_name; if (!is_uploaded_file($uploadfile)) { - ShowMsg("您没有选择上传的文件或上传的文件大小被限制", "-1"); + ShowMsg("您没有选择上传文件或上传的文件大小被限制", "-1"); exit(); } //软件类型所有支持的附件 @@ -27,7 +27,7 @@ $cfg_softtype = $cfg_softtype; $cfg_softtype = str_replace('||', '|', $cfg_softtype); $uploadfile_name = trim(preg_replace("#[ \r\n\t\*\%\\\/\?><\|\":]{1,}#", '', $uploadfile_name)); if (!preg_match("#\.(".$cfg_softtype.")#i", $uploadfile_name)) { - ShowMsg("您所上传的{$uploadmbtype}不在许可列表", "-1"); + ShowMsg("您上传的{$uploadmbtype}扩展名已被系统禁止", "-1"); exit(); } $nowtme = time(); @@ -45,7 +45,7 @@ if (!empty($newname)) { if (!preg_match("#\.#", $filename)) $fs = explode('.', $uploadfile_name); else $fs = explode('.', $filename); if (preg_match("#".$cfg_not_allowall."#", $fs[count($fs) - 1])) { - ShowMsg("指定的文件名已被系统禁止", "javascript:;"); + ShowMsg("文件扩展名已被系统禁止", "javascript:;"); exit(); } if (!preg_match("#\.#", $filename)) $filename = $filename.'.'.$fs[count($fs) - 1]; @@ -53,13 +53,13 @@ if (!empty($newname)) { $filename = $cuserLogin->getUserID().'-'.dd2char(MyDate('ymdHis', $nowtme)); $fs = explode('.', $uploadfile_name); if (preg_match("#".$cfg_not_allowall."#", $fs[count($fs) - 1])) { - ShowMsg("您上传的文件可能存在不安全因素，系统拒绝操作", "-1"); + ShowMsg("您上传的文件失败，请重新上传", "-1"); exit(); } $filename = $filename.'.'.$fs[count($fs) - 1]; } if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($filename))) { - ShowMsg("指定的文件名已被系统禁止", "javascript:;"); + ShowMsg("文件扩展名已被系统禁止", "javascript:;"); exit(); } $fullfilename = $cfg_basedir.$activepath.'/'.$filename; diff --git a/src/admin/dialog/select_templets.php b/src/admin/dialog/select_templets.php index e9dfc186..6d4fd77c 100644 --- a/src/admin/dialog/select_templets.php +++ b/src/admin/dialog/select_templets.php @@ -33,55 +33,45 @@ if (empty($comeback)) { ?> - - - - 选择模板 - - - - - - - -
    - - - - - - - - - - + + + 选择模板 + + + + + + +
    +
    -
    - - - - - - -
    -
    选择文件文件大小修改时间
    + + + + + + + + +
    +
    + + + + + + +
    +
    选择文件文件大小修改时间
    + \ No newline at end of file diff --git a/src/admin/dialog/select_templets_post.php b/src/admin/dialog/select_templets_post.php index cff29fbd..916b659d8 100644 --- a/src/admin/dialog/select_templets_post.php +++ b/src/admin/dialog/select_templets_post.php @@ -14,7 +14,7 @@ if (empty($uploadfile)) { $uploadfile = ""; } if (!is_uploaded_file($uploadfile)) { - ShowMsg("您没有选择上传的文件", "-1"); + ShowMsg("您没有选择上传文件", "-1"); exit(); } if (!preg_match("#^text#", $uploadfile_type)) { @@ -22,7 +22,7 @@ if (!preg_match("#^text#", $uploadfile_type)) { exit(); } if (!preg_match("#\.(".$cfg_txttype.")#i", $uploadfile_name)) { - ShowMsg("您所上传的模板文件类型不能被识别，只允许htm、html、tpl、txt扩展名", "-1"); + ShowMsg("您上传的模板文件类型存在问题，请使用htm、html、tpl、txt扩展名", "-1"); exit(); } if ($filename =='') { @@ -30,7 +30,7 @@ if ($filename =='') { } $filename = trim(preg_replace("#[ \r\n\t\*\%\\\/\?><\|\":]{1,}#", '', $filename)); if ($filename == '' || !preg_match("#\.(".$cfg_txttype.")#i", $filename)) { - ShowMsg("您所上传的文件存在问题，请检查文件类型是否适合", "-1"); + ShowMsg("您上传的文件存在问题，请检查文件类型", "-1"); exit(); } $fullfilename = $cfg_basedir.$activepath."/".$filename; diff --git a/src/admin/file_class.php b/src/admin/file_class.php index 7953faa9..04c4b9d4 100644 --- a/src/admin/file_class.php +++ b/src/admin/file_class.php @@ -32,7 +32,7 @@ class FileManagement $newext = pathinfo($newname)['extension']; if ($oldext != $newext) { if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($newname))) { - ShowMsg("指定的文件名已被系统禁止", "javascript:;"); + ShowMsg("文件扩展名已被系统禁止", "javascript:;"); exit(); } } diff --git a/src/admin/file_manage_control.php b/src/admin/file_manage_control.php index cb5b3432..27ecc0ca 100644 --- a/src/admin/file_manage_control.php +++ b/src/admin/file_manage_control.php @@ -41,7 +41,7 @@ else if ($fmdo == "edit") { CheckCSRF(); $filename = str_replace("..", "", $filename); if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($filename))) { - ShowMsg("指定的文件名已被系统禁止", "javascript:;"); + ShowMsg("文件扩展名已被系统禁止", "javascript:;"); exit(); } $file = "$cfg_basedir$activepath/$filename"; diff --git a/src/admin/friendlink_edit.php b/src/admin/friendlink_edit.php index d1903bcd..f184f51c 100644 --- a/src/admin/friendlink_edit.php +++ b/src/admin/friendlink_edit.php @@ -44,7 +44,7 @@ if ($dopost == "delete") { } if (!empty($logoimg)) { if (!is_uploaded_file($logoimg)) { - ShowMsg("您没有选择上传的文件".$logoimg, "-1"); + ShowMsg("您没有选择上传文件".$logoimg, "-1"); exit(); } $mime = get_mime_type($logoimg); diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php index 7906b509..b8c080ea 100644 --- a/src/admin/inc/inc_archives_functions.php +++ b/src/admin/inc/inc_archives_functions.php @@ -354,7 +354,7 @@ function GetDDImage($litpic, $picname, $isremote) $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png"); $_FILES[$litpic]['type'] = strtolower(trim($_FILES[$litpic]['type'])); if (!in_array($_FILES[$litpic]['type'], $sparr)) { - ShowMsg("上传的图片格式错误，请使用JPEG、GIF、PNG格式的其中一种", "-1"); + ShowMsg("您上传的图片格式错误，请使用jpg、png、gif、wbmp格式其中一种", "-1"); exit(); } $savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); @@ -669,7 +669,7 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '') $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png"); $_FILES[$upname]['type'] = strtolower(trim($_FILES[$upname]['type'])); if (!in_array($_FILES[$upname]['type'], $sparr)) { - ShowMsg("上传的图片格式错误，请使用JPEG、GIF、PNG格式的其中一种", "-1"); + ShowMsg("您上传的图片格式错误，请使用jpg、png、gif、wbmp格式其中一种", "-1"); exit(); } if (!empty($handurl) && !preg_match("#^http:\/\/#i", $handurl) && file_exists($cfg_basedir.$handurl)) { diff --git a/src/admin/inc/inc_menu_module.php b/src/admin/inc/inc_menu_module.php index ebb8c2a9..29f57105 100644 --- a/src/admin/inc/inc_menu_module.php +++ b/src/admin/inc/inc_menu_module.php @@ -26,7 +26,7 @@ while ($row = $dsql->GetObject()) { } $adminMenu = ''; if ($cuserLogin->getUserType() >= 10) { - $adminMenu = DEDEBIZ_SAFE_MODE? "" : " + $adminMenu = DEDEBIZ_SAFE_MODE? "" : " "; diff --git a/src/admin/makehtml_homepage.php b/src/admin/makehtml_homepage.php index 504bffd3..35fb3a53 100644 --- a/src/admin/makehtml_homepage.php +++ b/src/admin/makehtml_homepage.php @@ -61,7 +61,7 @@ if ($dopost == "view") { $remotepos = empty($remotepos) ? '/index.html' : $remotepos; $serviterm = empty($serviterm) ? "" : $serviterm; if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($position))) { - ShowMsg("指定的文件名已被系统禁止", "javascript:;"); + ShowMsg("文件扩展名已被系统禁止", "javascript:;"); exit(); } $homeFile = DEDEADMIN."/".$position; diff --git a/src/admin/media_add.php b/src/admin/media_add.php index bff69928..dfa51387 100644 --- a/src/admin/media_add.php +++ b/src/admin/media_add.php @@ -53,7 +53,7 @@ if ($dopost == "upload") { CloseFtp(); } if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($newname))) { - ShowMsg("指定的文件名已被系统禁止", "javascript:;"); + ShowMsg("文件扩展名已被系统禁止", "javascript:;"); exit(); } $fullfilename = $cfg_basedir.$filename; diff --git a/src/admin/sys_info_mark.php b/src/admin/sys_info_mark.php index e39f42e1..4450ba3a 100644 --- a/src/admin/sys_info_mark.php +++ b/src/admin/sys_info_mark.php @@ -33,7 +33,7 @@ if ($action == "save") { if (is_uploaded_file($newimg)) { $imgfile_type = strtolower(trim($newimg_type)); if (!in_array($imgfile_type, $allow_mark_types)) { - ShowMsg("上传的图片格式错误，请使用 gif、png格式的其中一种", "-1"); + ShowMsg("上传的图片格式错误，请使用gif、png格式的其中一种", "-1"); exit(); } if ($imgfile_type == 'image/xpng' || $imgfile_type == 'image/png') { diff --git a/src/admin/templets/action_search.htm b/src/admin/templets/action_search.htm index 3af70ffe..b4dea6c3 100644 --- a/src/admin/templets/action_search.htm +++ b/src/admin/templets/action_search.htm @@ -14,14 +14,14 @@ 当前位置 > 搜索结果 - - => - - - - - - + + => + + + + + + diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index 23cfd59d..29bd7040 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -390,7 +390,6 @@ } } - + \ No newline at end of file diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index 81f72c39..93b5220d 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -440,7 +440,6 @@ } } - + \ No newline at end of file diff --git a/src/admin/templets/freelist_main.htm b/src/admin/templets/freelist_main.htm index 526bbfe4..62d40100 100644 --- a/src/admin/templets/freelist_main.htm +++ b/src/admin/templets/freelist_main.htm @@ -10,33 +10,11 @@ - - - - - - -
    - - - - -
    -
    - - - - -
    -
    - -
    -
    + + + + + + +
    + + + + +
    +
    + + + + +
    +
    + +
    +
    \ No newline at end of file diff --git a/src/admin/templets/search_keywords_main.htm b/src/admin/templets/search_keywords_main.htm index d1eb5ba3..eaf17eee 100644 --- a/src/admin/templets/search_keywords_main.htm +++ b/src/admin/templets/search_keywords_main.htm @@ -12,22 +12,11 @@ - - -
    - - - - -
    - - -
    + + +
    + + + + +
    + + +
    \ No newline at end of file diff --git a/src/admin/templets_one_add.php b/src/admin/templets_one_add.php index 0b51cf5b..c9d99ec6 100644 --- a/src/admin/templets_one_add.php +++ b/src/admin/templets_one_add.php @@ -18,7 +18,7 @@ if ($dopost == "save") { $filename = preg_replace("#^\/#", "", $nfilename); if (DEDEBIZ_SAFE_MODE) $ismake = 0; //安全模式不允许编译 if (!preg_match('#\.htm$#i', trim($template))) { - ShowMsg("指定的文件名已被系统禁止", "javascript:;"); + ShowMsg("文件扩展名已被系统禁止", "javascript:;"); exit(); } if ($likeid == '') { diff --git a/src/admin/templets_one_edit.php b/src/admin/templets_one_edit.php index 44e57995..f1fd6029 100644 --- a/src/admin/templets_one_edit.php +++ b/src/admin/templets_one_edit.php @@ -19,7 +19,7 @@ if ($dopost == "saveedit") { $filename = preg_replace("#^\/#", "", $nfilename); if (DEDEBIZ_SAFE_MODE) $ismake = 0; //安全模式不允许编译 if (!preg_match('#\.htm$#i', trim($template))) { - ShowMsg("指定的文件名已被系统禁止", "javascript:;"); + ShowMsg("文件扩展名已被系统禁止", "javascript:;"); exit(); } //如果修改了文件名，删除旧文件 diff --git a/src/system/helpers/upload.helper.php b/src/system/helpers/upload.helper.php index edc456c2..239c9431 100755 --- a/src/system/helpers/upload.helper.php +++ b/src/system/helpers/upload.helper.php @@ -17,8 +17,8 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @param string $ftype 文件类型 * @param string $rnddd 后缀数字 * @param bool $watermark 是否水印 - * @param string $filetype image、media、addon $file_type='' 对于swfupload上传的文件，因为没有filetype，所以需指定，并且有些特殊之处不同 - * @return int -1没选定上传文件，0文件类型不允许, -2保存失败 + * @param string $filetype image、media、addon $file_type='' 对于swfupload上传的文件，因为没有filetype，所以需指定，并且有些特殊之处不同 + * @return int -1没选定上传文件，0文件类型不允许，-2保存失败 */ if (!function_exists('AdminUpload')) { function AdminUpload($uploadname, $ftype = 'image', $rnddd = 0, $watermark = TRUE, $filetype = '') @@ -90,14 +90,12 @@ if (!function_exists('AdminUpload')) { return $fileurl; } } -//前台会员通用上传函数 -//$upname 是文件上传框的表单名，而不是表单的变量 -//$handname 允许会员手工指定网址情况下的网址 +//前台会员通用上传函数：$upname是文件上传框的表单名，而不是表单的变量；$handname允许会员手工指定网址情况下的网址 if (!function_exists('MemberUploads')) { function MemberUploads($upname, $handname, $userid = 0, $utype = 'image', $exname = '', $maxwidth = 0, $maxheight = 0, $water = false, $isadmin = false) { global $cfg_imgtype, $cfg_mb_addontype, $cfg_mediatype, $cfg_user_dir, $cfg_basedir, $cfg_dir_purview; - //当为游客投稿的情况下，这个 id 为 0 + //当为游客投稿的情况下，这个id为0 if (empty($userid)) $userid = 0; if (!is_dir($cfg_basedir.$cfg_user_dir."/$userid")) { MkdirAll($cfg_basedir.$cfg_user_dir."/$userid", $cfg_dir_purview); @@ -112,23 +110,23 @@ if (!function_exists('MemberUploads')) { //源文件类型检查 if ($utype == 'image') { if (!preg_match("/\.(".$cfg_imgtype.")$/", $GLOBALS[$upname.'_name'])) { - ShowMsg("您所上传的图片类型不在许可列表，请上传{$cfg_imgtype}类型", '-1'); + ShowMsg("您上传的图片类型错误，请上传{$cfg_imgtype}类型", "-1"); exit(); } $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp"); $imgfile_type = strtolower(trim($GLOBALS[$upname.'_type'])); if (!in_array($imgfile_type, $sparr)) { - ShowMsg('上传的图片格式错误，请使用JPEG、GIF、PNG、WBMP格式的其中一种', '-1'); + ShowMsg("您上传的图片格式错误，请使用jpg、png、gif、wbmp格式其中一种", "-1"); exit(); } } else if ($utype == 'flash' && !preg_match("/\.swf$/", $GLOBALS[$upname.'_name'])) { - ShowMsg('上传的文件必须为flash文件', '-1'); + ShowMsg("上传的文件必须为flash文件", "-1"); exit(); } else if ($utype == 'media' && !preg_match("/\.(".$cfg_mediatype.")$/", $GLOBALS[$upname.'_name'])) { - ShowMsg('您所上传的文件类型必须为：'.$cfg_mediatype, '-1'); + ShowMsg("您上传的文件类型必须为：$cfg_mediatype", "-1"); exit(); } else if (!preg_match("/\.(".$allAllowType.")$/", $GLOBALS[$upname.'_name'])) { - ShowMsg("您所上传的文件类型不被允许", '-1'); + ShowMsg("您上传的文件类型不被允许", '-1'); exit(); } //再次严格检测文件扩展名是否符合系统定义的类型 @@ -136,12 +134,12 @@ if (!function_exists('MemberUploads')) { $sname = $fs[count($fs) - 1]; $alltypes = explode('|', $allAllowType); if (!in_array(strtolower($sname), $alltypes)) { - ShowMsg('您所上传的文件类型不被允许', '-1'); + ShowMsg('您上传的文件类型不被允许', '-1'); exit(); } //强制禁止的文件类型 if (preg_match("/(asp|php|pl|cgi|shtm|js)$/", $sname)) { - ShowMsg('您上传的文件为系统禁止的类型', '-1'); + ShowMsg("您上传的文件已被系统禁止", '-1'); exit(); } if ($exname == '') { @@ -162,7 +160,7 @@ if (!function_exists('MemberUploads')) { @unlink($GLOBALS[$upname]); if (@filesize($cfg_basedir.$filename) > $GLOBALS['cfg_mb_upload_size'] * 1024) { @unlink($cfg_basedir.$filename); - ShowMsg('您上传的文件超出系统大小限制', '-1'); + ShowMsg("您上传的文件超出系统大小限制", "-1"); exit(); } //加水印或缩小图片 @@ -185,9 +183,7 @@ if (!function_exists('MemberUploads')) { exit('Not allow filename for not safe!'); } else if (!preg_match("/\.(".$allAllowType.")$/", $handname)) { exit('Not allow filename for filetype!'); - } - //2011-4-10 修复会员中心修改相册时候错误(by:jason123j) - else if (!preg_match('#^http:#', $handname) && !preg_match('#^'.$cfg_user_dir.'/'.$userid."#", $handname) && !$isadmin) { + } else if (!preg_match('#^http:#', $handname) && !preg_match('#^'.$cfg_user_dir.'/'.$userid."#", $handname) && !$isadmin) { exit('Not allow filename for not userdir!'); } return $handname;