diff --git a/admin/inc/inc_archives_functions.php b/admin/inc/inc_archives_functions.php index b554d53..d4dbffd 100644 --- a/admin/inc/inc_archives_functions.php +++ b/admin/inc/inc_archives_functions.php @@ -17,7 +17,7 @@ if (!isset($_NOT_ARCHIVES)) { require_once(DEDEINC.'/customfields.func.php'); } /** - * 获得网页里的外部资源，针对图片 + * 获得网页里图片外部资源 * * @access public * @param string $body 文档 @@ -35,7 +35,7 @@ function GetCurContentAlbum($body, $rfurl, &$firstdd) $cfg_basedir = $GLOBALS['cfg_basedir']; $basehost = IsSSL()? "https://".$_SERVER["HTTP_HOST"] : "http://".$_SERVER["HTTP_HOST"]; $img_array = array(); - preg_match_all("/(src)=[\"|'| ]{0,}(http:\/\/([^>]*)\.(gif|jpg|png))/isU", $body, $img_array); + preg_match_all("/(src)=[\"|'| ]{0,}(http:\/\/([^>]*)\.(gif|jpg|jpeg|png))/isU", $body, $img_array); $img_array = array_unique($img_array[2]); $imgUrl = $cfg_uploaddir.'/'.MyDate($cfg_addon_savetype, time()); $imgPath = $cfg_basedir.$imgUrl; @@ -47,13 +47,11 @@ function GetCurContentAlbum($body, $rfurl, &$firstdd) foreach ($img_array as $key => $value) { $value = trim($value); if ( - preg_match("#".$basehost."#i", $value) || !preg_match("#^http:\/\/#i", $value) - || ($cfg_basehost != $basehost && preg_match("#".$cfg_basehost."#i", $value)) - ) { + preg_match("#".$basehost."#i", $value) || !preg_match("#^http:\/\/#i", $value) || ($cfg_basehost != $basehost && preg_match("#".$cfg_basehost."#i", $value))) { continue; } $itype = substr($value, -4, 4); - if (!preg_match("#\.(gif|jpg|png)#", $itype)) $itype = ".jpg"; + if (!preg_match("#\.(gif|jpg|jpeg|png)#", $itype)) $itype = ".jpg"; $rndFileName = $imgPath.'/'.$milliSecond.'-'.$key.$itype; $iurl = $imgUrl.'/'.$milliSecond.'-'.$key.$itype; //下载并保存文件 @@ -174,7 +172,7 @@ function GetCurContent($body) * * @access public * @param string $url 地址 - * @param int $uid 用户id + * @param int $uid 会员id * @return array */ function GetRemoteImage($url, $uid = 0) @@ -352,12 +350,12 @@ function GetDDImage($litpic, $picname, $isremote) $ntime = time(); if (($litpic != 'none' || $litpic != 'ddfirst') && !empty($_FILES[$litpic]['tmp_name']) && is_uploaded_file($_FILES[$litpic]['tmp_name']) ) { - //如果用户自行上传缩略图 + //如果会员自行上传缩略图 $istype = 0; $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); @@ -381,8 +379,7 @@ function GetDDImage($litpic, $picname, $isremote) } @move_uploaded_file($_FILES[$litpic]['tmp_name'], $cfg_basedir.$fullUrl); $litpic = $fullUrl; - if ($GLOBALS['cfg_ddimg_full'] == 'Y') @ImageResizeNew($cfg_basedir.$fullUrl, $cfg_ddimg_width, $cfg_ddimg_height); - else @ImageResize($cfg_basedir.$fullUrl, $cfg_ddimg_width, $cfg_ddimg_height); + @ImageResizeNew($cfg_basedir.$fullUrl, $cfg_ddimg_width, $cfg_ddimg_height); $img = $cfg_basedir.$litpic; } else { $picname = trim($picname); @@ -394,16 +391,14 @@ function GetDDImage($litpic, $picname, $isremote) } else { $litpic = $ddinfos[0]; if ($ddinfos[1] > $cfg_ddimg_width || $ddinfos[2] > $cfg_ddimg_height) { - if ($GLOBALS['cfg_ddimg_full'] == 'Y') @ImageResizeNew($cfg_basedir.$litpic, $cfg_ddimg_width, $cfg_ddimg_height); - else @ImageResize($cfg_basedir.$litpic, $cfg_ddimg_width, $cfg_ddimg_height); + @ImageResizeNew($cfg_basedir.$litpic, $cfg_ddimg_width, $cfg_ddimg_height); } } } else { if ($litpic == 'ddfirst' && !preg_match("#^http:\/\/#i", $picname)) { $oldpic = $cfg_basedir.$picname; $litpic = str_replace('.', '-ty.', $picname); - if ($GLOBALS['cfg_ddimg_full'] == 'Y') @ImageResizeNew($oldpic, $cfg_ddimg_width, $cfg_ddimg_height, $cfg_basedir.$litpic); - else @ImageResize($oldpic, $cfg_ddimg_width, $cfg_ddimg_height, $cfg_basedir.$litpic); + @ImageResizeNew($oldpic, $cfg_ddimg_width, $cfg_ddimg_height, $cfg_basedir.$litpic); if (!is_file($cfg_basedir.$litpic)) $litpic = ''; } else { $litpic = $picname; @@ -634,12 +629,11 @@ function Replace_Links(&$body, $allow_urls = array()) */ function GetImageMapDD($filename, $maxwidth) { - global $cuserLogin, $dsql, $cfg_ddimg_height, $cfg_ddimg_full; + global $cuserLogin, $dsql, $cfg_ddimg_height; $ddn = substr($filename, -3); $ddpicok = preg_replace("#\.".$ddn."$#", "-ty.".$ddn, $filename); $toFile = $GLOBALS['cfg_basedir'].$ddpicok; - if ($cfg_ddimg_full == 'Y') ImageResizeNew($GLOBALS['cfg_basedir'].$filename, $maxwidth, $cfg_ddimg_height, $toFile); - else ImageResize($GLOBALS['cfg_basedir'].$filename, $maxwidth, $cfg_ddimg_height, $toFile); + ImageResizeNew($GLOBALS['cfg_basedir'].$filename, $maxwidth, $cfg_ddimg_height, $toFile); //保存图片附件信息 $fsize = filesize($toFile); $ddpicoks = explode('/', $ddpicok); @@ -670,13 +664,13 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '') $filename = ''; $isrm_up = FALSE; $handurl = trim($handurl); - //如果用户自行上传了图片 + //如果会员自行上传了图片 if (!empty($_FILES[$upname]['tmp_name']) && is_uploaded_file($_FILES[$upname]['tmp_name'])) { $istype = 0; $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)) { @@ -757,8 +751,8 @@ function GetUpdateTest() if ($cfg_make_andcat == 'Y') $dolist .= empty($dolist) ? 'makeparenttype' : ',makeparenttype'; $dolists = explode(',', $dolist); $jumpUrl = "task_do.php?typeid={$typeid}&aid={$arcID}&dopost={$dolists[0]}&nextdo=".preg_replace("#".$dolists[0]."[,]{0,1}#", '', $dolist); - $revalue = "\r\n"; - $revalue .= "\r\n"; + $revalue = "
正在进行相关文档更新，请完成前不要进行其它操作：\r\n
\r\n\r\n
\r\n"; + $revalue .= "\r\n"; $revalue .= "
正在进行相关文档更新，未完成前不要执行其它操作：\r\n
\r\n\r\n
"; } else { $revalue = ''; diff --git a/admin/inc/inc_menu.php b/admin/inc/inc_menu.php index 8cd6026..41583e9 100644 --- a/admin/inc/inc_menu.php +++ b/admin/inc/inc_menu.php @@ -35,14 +35,14 @@ $gitUrl = DEDEBIZURL."/git"; $dedebizUrl = DEDEBIZURL; $adminMenu1 = $adminMenu2 = ''; if ($cuserLogin->getUserType() >= 10) { - $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : " + $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : " ")." - - + + ".(DEDEBIZ_SAFE_MODE? "" : "")." @@ -50,28 +50,28 @@ if ($cuserLogin->getUserType() >= 10) { "; - $adminMenu2 = " + $adminMenu2 = " - - + + - + ".(DEDEBIZ_SAFE_MODE? "" : "")." ".(DEDEBIZ_SAFE_MODE? "" : "")." "; } -$menusMain = " +$menusMain = " @@ -79,18 +79,18 @@ $menusMain = " - + - + $addset - + $adminMenu1 - + @@ -99,30 +99,31 @@ $adminMenu1 ".(DEDEBIZ_SAFE_MODE? "" : "")." {$GLOBALS['menusMoudle']} - + + - + - + $adminMenu2 - + "; diff --git a/admin/makehtml_m_all.php b/admin/makehtml_m_all.php index b0a5001..7ad9f0c 100644 --- a/admin/makehtml_m_all.php +++ b/admin/makehtml_m_all.php @@ -46,7 +46,7 @@ if ($action == '') { } else { if (file_exists($homeFile)) echo "启用静态更新，建议删除"+$homeFile; } - ShowMsg("完成所有文档更新，开始更新栏目", "makehtml_m_all.php?action=make&step=4&uptype=$uptype&mkvalue=$mkvalue"); + ShowMsg("完成所有文档更新，开始更新所有栏目", "makehtml_m_all.php?action=make&step=4&uptype=$uptype&mkvalue=$mkvalue"); exit(); } //更新栏目 @@ -94,11 +94,11 @@ if ($action == '') { } fwrite($fp, "?".">"); fclose($fp); - ShowMsg("完成栏目缓存处理，开始更新栏目", "makehtml_m_list_action.php?gotype=mkall"); + ShowMsg("完成栏目缓存处理，开始更新所有栏目", "makehtml_m_list_action.php?gotype=mkall"); exit(); } else { fclose($fp); - ShowMsg("没有可更新的栏目，最后数据优化", "makehtml_m_all.php?action=make&step=10"); + ShowMsg("没有可更新的栏目，数据已优化", "makehtml_m_all.php?action=make&step=10"); exit(); } } diff --git a/admin/makehtml_m_archives_action.php b/admin/makehtml_m_archives_action.php index fa52518..1588074 100644 --- a/admin/makehtml_m_archives_action.php +++ b/admin/makehtml_m_archives_action.php @@ -90,7 +90,7 @@ $ttime = time() - $sstime; $ttime = number_format(($ttime / 60), 2); //返回提示信息 $tjlen = $totalnum > 0 ? ceil(($tjnum / $totalnum) * 100) : 100; -$tjsta = "
"; +$tjsta = "
"; $tjsta .= "到达位置".($startdd + $pagesize)."，用时{$ttime}分钟，完成更新文档总数$tjlen%"; //速度测试 if ($tjnum < $totalnum) { diff --git a/admin/makehtml_m_list_action.php b/admin/makehtml_m_list_action.php index ee4b465..b6f0ef2 100644 --- a/admin/makehtml_m_list_action.php +++ b/admin/makehtml_m_list_action.php @@ -43,6 +43,10 @@ else if ($gotype == 'mkall') { $idArray = array(); if (file_exists($mkcachefile)) require_once($mkcachefile); } +if (!$idArray) { + ShowMsg("暂无栏目，请添加栏目", "javascript:;"); + exit; +} //当前更新栏目id $totalpage = count($idArray); if (isset($idArray[$pageno])) { @@ -52,7 +56,7 @@ if (isset($idArray[$pageno])) { ShowMsg("完成所有栏目更新", "javascript:;"); exit(); } else if ($gotype == 'mkall' || $gotype == 'mkallct') { - ShowMsg("完成所有栏目更新，最后数据优化", "makehtml_m_all.php?action=make&step=10"); + ShowMsg("完成所有栏目更新，数据已优化", "makehtml_m_all.php?action=make&step=10"); exit(); } } @@ -64,7 +68,7 @@ $reurl = ''; //更新数组所记录栏目 if (!empty($tid)) { if (!isset($cfg_Cs[$tid])) { - ShowMsg('没有该栏目数据，可能缓存文件没有更新，请检查是否有写入权限', 'javascript:;'); + ShowMsg('没有该栏目数据，缓存文件没有更新，请检查是否有写入权限', 'javascript:;'); exit(); } if ($cfg_Cs[$tid][1] > 0) { @@ -108,18 +112,18 @@ if ($nextpage >= $totalpage && $finishType) { ShowMsg("完成所有栏目更新，浏览栏目", "javascript:;"); exit(); } else if ($gotype == 'mkall' || $gotype == 'mkallct') { - ShowMsg("完成所有栏目更新，最后数据优化", "makehtml_m_all.php?action=make&step=10"); + ShowMsg("完成所有栏目更新，数据已优化", "makehtml_m_all.php?action=make&step=10"); exit(); } } else { $typename = isset($cfg_Cs[$tid][3])? base64_decode($cfg_Cs[$tid][3]) : ""; if ($finishType) { $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$nextpage"; - ShowMsg("更新栏目id：".$tid."，栏目名称：{$typename}，继续执行任务", $gourl, 0, 100); + ShowMsg("更新栏目（id：".$tid."）{$typename}，继续更新栏目", $gourl, 0, 100); exit(); } else { $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&mkpage=$mkpage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$pageno"; - ShowMsg("更新栏目id：".$tid."，栏目名称：{$typename}，继续执行任务", $gourl, 0, 100); + ShowMsg("更新栏目（id：".$tid."）{$typename}，继续更新栏目", $gourl, 0, 100); exit(); } } diff --git a/admin/templets/makehtml_m_all.htm b/admin/templets/makehtml_m_all.htm index bf4102d..a8a1e64 100644 --- a/admin/templets/makehtml_m_all.htm +++ b/admin/templets/makehtml_m_all.htm @@ -11,6 +11,40 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
更新整站
更新选项： + + + +
起始时间：
+
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
更新整站
更新选项： - - - -
起始时间：
结果：
-
-
\ No newline at end of file diff --git a/admin/templets/makehtml_m_archives.htm b/admin/templets/makehtml_m_archives.htm index 6739f24..b1f203f 100644 --- a/admin/templets/makehtml_m_archives.htm +++ b/admin/templets/makehtml_m_archives.htm @@ -9,8 +9,8 @@ - - + +
@@ -43,15 +43,12 @@ - - - - - - - -
更新文档
结果：
-
-
+ + +
+ + + + \ No newline at end of file diff --git a/admin/templets/makehtml_m_config.htm b/admin/templets/makehtml_m_config.htm index 7dfe26e..0275578 100644 --- a/admin/templets/makehtml_m_config.htm +++ b/admin/templets/makehtml_m_config.htm @@ -4,15 +4,15 @@ 手机端配置 - + - - - + + +
@@ -75,7 +75,7 @@ - -
手机端配置
+ + \ No newline at end of file diff --git a/admin/templets/makehtml_m_list.htm b/admin/templets/makehtml_m_list.htm index 49f80dc..add5408 100644 --- a/admin/templets/makehtml_m_list.htm +++ b/admin/templets/makehtml_m_list.htm @@ -9,8 +9,8 @@ - - + +
@@ -42,15 +42,12 @@ - - - - - - - -
更新栏目
结果：
-
-
+ + +
+ + + + \ No newline at end of file diff --git a/system/archive/archives.class.php b/system/archive/archives.class.php index 8cda349..8a3c1cd 100644 --- a/system/archive/archives.class.php +++ b/system/archive/archives.class.php @@ -1,7 +1,7 @@