更新2.7

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 = "<table id='tgtable' class='maintable my-3'><tr><td bgcolor='#f8f8f8'>正在进行相关文档更新，请完成前不要进行其它操作：\r\n</td></tr>\r\n";
-        $revalue .= "<tr><td>\r\n<iframe name='stafrm' id='stafrm' frameborder='0' width='100%' height='200px' src='$jumpUrl'></iframe>\r\n</td></tr>\r\n";
+        $revalue = "<table id='tgtable' class='maintable my-3'><tr><td bgcolor='#f8f8f8'>正在进行相关文档更新，未完成前不要执行其它操作：\r\n</td></tr>\r\n";
+        $revalue .= "<tr><td>\r\n<iframe name='stafrm' id='stafrm' frameborder='0' width='100%' height='360px' src='$jumpUrl'></iframe>\r\n</td></tr>\r\n";
         $revalue .= "</table>";
     } else {
         $revalue = '';

admin/inc/inc_menu.php

@@ -35,14 +35,14 @@ $gitUrl = DEDEBIZURL."/git";
 $dedebizUrl = DEDEBIZURL;
 $adminMenu1 = $adminMenu2 = '';
 if ($cuserLogin->getUserType() >= 10) {
-    $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : "<m:top item='11_' name='模板管理' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All' icon='fa-cube'>
+    $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : "<m:top item='11_' name='模板管理' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All' icon='fa fa-cube'>
     <m:item name='默认模板管理' link='templets_main.php' rank='temp_All' target='main' />
     <m:item name='标签源码管理' link='templets_tagsource.php' rank='temp_All' target='main' />
     <m:item name='智能标记向导' link='mytag_tag_guide.php' rank='temp_Other' target='main' />
     <m:item name='全局标记测试' link='tag_test.php' rank='temp_Test' target='main' />
 </m:top>")."
-<m:top item='4_' name='文档模型' rank='t_List,t_AccList,c_List,temp_One' icon='fa-area-chart'>
-    <m:item name='文档模型管理' link='mychannel_main.php' rank='c_List' target='main' />
+<m:top item='4_' name='模型管理' rank='t_List,t_AccList,c_List,temp_One' icon='fa fa-area-chart'>
+    ".(DEDEBIZ_SAFE_MODE? "" : "<m:item name='文档模型管理' link='mychannel_main.php' rank='c_List' target='main' />")."
     <m:item name='文档单页管理' link='templets_one.php' rank='temp_One' target='main' />
     <m:item name='联动类别管理' link='stepselect_main.php' rank='c_Stepseclect' target='main' />
     <m:item name='自由列表管理' link='freelist_main.php' rank='c_List' target='main' />
@@ -50,28 +50,28 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='自定义文档属性' link='content_att.php' rank='sys_Att' target='main' />
     <m:item name='自定义表单管理' link='diy_main.php' rank='c_List' target='main' />
 </m:top>";
-  $adminMenu2 = "<m:top item='10_' name='支付工具' rank='sys_Data' icon='fa-credit-card'>
+  $adminMenu2 = "<m:top item='10_' name='财务管理' rank='sys_Data' icon='fa fa-credit-card'>
     <m:item name='积分产品管理' link='cards_manage.php' rank='sys_Data' target='main' />
     <m:item name='积分产品分类' link='cards_type.php' rank='sys_Data' target='main' />
     <m:item name='会员消费记录' link='member_operations.php' rank='sys_Data' target='main' />
     <m:item name='会员等级分类' link='member_type.php' rank='sys_Data' target='main' />
     <m:item name='支付接口设置' link='sys_payment.php' .php' rank='sys_Data' target='main' />
 </m:top>
-<m:top item='12_' name='系统设置' rank='sys_User,sys_Group,sys_Edit,sys_Log,sys_Data' icon='fa-cog'>
-    <m:item name='系统配置变量' link='sys_info.php' rank='sys_Edit' target='main' />
+<m:top item='12_' name='系统设置' rank='sys_User,sys_Group,sys_Edit,sys_Log,sys_Data' icon='fa fa-cog'>
+    <m:item name='系统变量设置' link='sys_info.php' rank='sys_Edit' target='main' />
     <m:item name='系统日志管理' link='log_list.php' rank='sys_Log' target='main' />
     <m:item name='系统会员管理' link='sys_admin_user.php' rank='sys_User' target='main' />
     <m:item name='系统会员组管理' link='sys_group.php' rank='sys_Group' target='main' />
     <m:item name='图片水印设置' link='sys_info_mark.php' rank='sys_Edit' target='main' />
     <m:item name='软件下载设置' link='soft_config.php' rank='sys_SoftConfig' target='main' />
-    <m:item name='防采集小工具' link='article_string_mix.php' rank='sys_StringMix' target='main' />
+    <m:item name='防采集工具' link='article_string_mix.php' rank='sys_StringMix' target='main' />
     ".(DEDEBIZ_SAFE_MODE? "" : "<m:item name='数据备份还原' link='sys_data.php' rank='sys_Data' target='main' />")."
     ".(DEDEBIZ_SAFE_MODE? "" : "<m:item name='SQL命令工具' link='sys_sql_query.php' rank='sys_Data' target='main' />")."
     <m:item name='文件扫描工具' link='sys_safetest.php' rank='sys_verify' target='main' />
     <m:item name='系统修复工具' link='sys_repair.php' rank='sys_verify' target='main' />
 </m:top>";
 }
-$menusMain = "<m:top item='1_' name='常用操作' icon='fa-desktop'>
+$menusMain = "<m:top item='1_' name='常用功能' icon='fa fa-desktop'>
     <m:item name='网站栏目管理' link='catalog_main.php' ischannel='1' addalt='创建栏目' linkadd='catalog_add.php?listtype=all' rank='t_List,t_AccList' target='main' />
     <m:item name='所有文档列表' link='content_list.php' rank='a_List,a_AccList' target='main' />
     <m:item name='待审核的文档' link='content_list.php?arcrank=-1' rank='a_Check,a_AccCheck' target='main' />
@@ -79,18 +79,18 @@ $menusMain = "<m:top item='1_' name='常用操作' icon='fa-desktop'>
     <m:item name='标签管理' link='tags_main.php' rank='sys_Keyword' target='main' />
     <m:item name='评论管理' link='feedback_main.php' rank='sys_Feedback' target='main' />
     <m:item name='专题管理' ischannel='1' link='content_s_list.php' linkadd='spec_add.php' channelid='-1' rank='spec_New' target='main' />
-    <m:item name='文档回收站' link='recycling.php' ischannel='1' addalt='清空文档' addico='fa-minus-circle' linkadd='archives_do.php?dopost=clear&aid=no&recycle=1' rank='a_List,a_AccList,a_MyList' target='main' />
+    <m:item name='文档回收站' link='recycling.php' ischannel='1' addalt='清空文档' addico='fa fa-minus-circle' linkadd='archives_do.php?dopost=clear&aid=no&recycle=1' rank='a_List,a_AccList,a_MyList' target='main' />
 </m:top>
-<m:top item='2_' name='文档管理' icon='fa-file-text'>
+<m:top item='2_' name='文档管理' icon='fa fa-file-text'>
     $addset
 </m:top>
-<m:top item='3_' name='附件管理' rank='sys_Upload,sys_MyUpload,plus_文件管理器' icon='fa-folder'>
+<m:top item='3_' name='附件管理' rank='sys_Upload,sys_MyUpload,plus_文件管理器' icon='fa fa-folder'>
     <m:item name='上传新文件' link='media_add.php' rank='' target='main' />
     <m:item name='附件管理' link='media_main.php' rank='sys_Upload,sys_MyUpload' target='main' />
     <m:item name='文件管理器' link='media_main.php?dopost=filemanager' rank='plus_文件管理器' target='main' />
 </m:top>
 $adminMenu1
-<m:top item='5_' name='批量维护' icon='fa-circle-o-notch'>
+<m:top item='5_' name='文档维护' icon='fa fa-circle-o-notch'>
     <m:item name='文档批量维护' link='content_batch_up.php' rank='sys_ArcBatch' target='main' />
     <m:item name='文档重复检测' link='article_test_same.php' rank='sys_ArcBatch' target='main' />
     <m:item name='文档关键词维护' link='article_keywords_main.php' rank='sys_Keyword' target='main' />
@@ -99,30 +99,31 @@ $adminMenu1
     ".(DEDEBIZ_SAFE_MODE? "" : "<m:item name='数据库字段替换' link='sys_data_replace.php' rank='sys_ArcBatch' target='main' />")."
 </m:top>
 {$GLOBALS['menusMoudle']}
-<m:top item='8_' name='更新电脑端' rank='sys_MakeHtml' icon='fa-repeat'>
+<m:top item='8_' name='更新网站' rank='sys_MakeHtml' icon='fa fa-repeat'>
     <m:item name='更新整站' link='makehtml_all.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新首页' link='makehtml_homepage.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新栏目' link='makehtml_list.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新文档' link='makehtml_archives.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新标签' link='makehtml_taglist.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新专题' link='makehtml_spec.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新列表' link='makehtml_freelist.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
 </m:top>
-<m:top item='8_' name='更新手机端' rank='sys_m_MakeHtml' icon='fa-spinner'>
+<m:top item='8_' name='更新手机端' rank='sys_m_MakeHtml' icon='fa fa-spinner'>
     <m:item name='手机端配置' link='makehtml_m_config.php' rank='sys_m_MakeHtml' target='main' />
     <m:item name='更新整站' link='makehtml_m_all.php' rank='sys_m_MakeHtml' target='main' />
     <m:item name='更新首页' link='makehtml_m_homepage.php' rank='sys_m_MakeHtml' target='main' />
     <m:item name='更新栏目' link='makehtml_m_list.php' rank='sys_m_MakeHtml' target='main' />
     <m:item name='更新文档' link='makehtml_m_archives.php' rank='sys_m_MakeHtml' target='main' />
 </m:top>
-<m:top item='9_' name='会员管理' rank='member_List,member_Type' icon='fa-user-circle'>
+<m:top item='9_' name='会员管理' rank='member_List,member_Type' icon='fa fa-user-circle'>
     <m:item name='所有会员列表' link='member_main.php' rank='member_List' target='main' />
     <m:item name='会员短信管理' link='member_pm.php' rank='member_Type' target='main' />
     <m:item name='会员级别设置' link='member_rank.php' rank='member_Type' target='main' />
     <m:item name='积分头衔设置' link='member_scores.php' rank='member_Type' target='main' />
 </m:top>
 $adminMenu2
-<m:top item='12_' name='系统帮助' icon='fa-info-circle'>
+<m:top item='12_' name='系统帮助' icon='fa fa-info-circle'>
     <m:item name='系统概况' link='$cfg_biz_helpUrl' rank='' target='_blank' />
     <m:item name='代码托管' link='$cfg_biz_gitUrl' rank='' target='_blank' />
 </m:top>";

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();
         }
     }

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 = "<div style='margin:0 auto 20px;width:360px;height:16px;text-align:left;border:1px solid #1eb867;border-radius:.2rem'><div style='max-width:360px;width:$tjlen%;height:16px;background:#1eb867'></div></div>";
+$tjsta = "<div style='margin:0 auto 20px;width:360px;height:16px;text-align:left;border:1px solid #1eb867;border-radius:.35rem'><div style='max-width:360px;width:$tjlen%;height:16px;background:#1eb867;border-radius:.35rem'></div></div>";
 $tjsta .= "到达位置<span class='text-primary'>".($startdd + $pagesize)."</span>，用时<span class='text-primary'>{$ttime}</span>分钟，完成更新文档总数<span class='text-primary'>$tjlen</span>%";
 //速度测试
 if ($tjnum < $totalnum) {

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("完成所有栏目更新，<a href='$reurl' target='_blank'>浏览栏目</a>", "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：<span class='text-primary'>".$tid."</span>，栏目名称：<span class='text-primary'>{$typename}</span>，继续执行任务", $gourl, 0, 100);
+        ShowMsg("更新栏目<span class='text-primary'>（id：".$tid."）{$typename}</span>，继续更新栏目", $gourl, 0, 100);
         exit();
     } else {
         $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&mkpage=$mkpage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$pageno";
-        ShowMsg("更新栏目id：<span class='text-primary'>".$tid."</span>，栏目名称：<span class='text-primary'>{$typename}</span>，继续执行任务", $gourl, 0, 100);
+        ShowMsg("更新栏目<span class='text-primary'>（id：".$tid."）{$typename}</span>，继续更新栏目", $gourl, 0, 100);
         exit();
     }
 }

admin/templets/makehtml_m_all.htm

@@ -11,6 +11,40 @@
 		<script src="../static/web/js/jquery.min.js"></script>
 		<script src="../static/web/js/moment.min.js"></script>
 		<script src="../static/web/js/daterangepicker.js"></script>
+	</head>
+	<body>
+		<form name="form1" action="makehtml_m_all.php" target="stafrm" method="post">
+			<input type="hidden" name="action" value="make">
+			<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
+				<tr>
+					<td bgcolor="#f5f5f5" colspan="2">更新整站</td>
+				</tr>
+				<tr>
+					<td width="260">更新选项：</td>
+					<td>
+						<label><input type="radio" name="uptype" id="uptype1" onClick="SelUp()" value="time" checked="checked"> 指定时间的所有更新</label>
+						<label><input type="radio" name="uptype" id="uptype2" onClick="SelUp()" value="id"> 指定文档的所有更新</label>
+						<label><input type="radio" name="uptype" id="uptype3" onClick="SelUp()" value="mkall"> 更新所有</label>
+					</td>
+				</tr>
+				<tr id="seltime">
+					<td>起始时间：</td>
+					<td><input type="text" name="starttime" id="starttime" value="<?php echo GetDateMk(time());?>" class="datepicker" class="admin-input-sm"></td>
+				</tr>
+				<tr id="selid" style="display:none">
+					<td>起始id：</td>
+					<td><input type="text" name="startid" id="startid" value="0" class="admin-input-sm"></td>
+				</tr>
+				<tr>
+					<td bgcolor="#e9ecef" colspan="2" align="center"><button type="submit" class="btn btn-success btn-sm">开始更新</button></td>
+				</tr>
+				<tr>
+					<td colspan="2" id="mtd">
+						<div id="mdv" class="admin-win-iframe"><iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="360px"></iframe></div>
+					</td>
+				</tr>
+		</table>
+		</form>
 		<script>
 			$(document).ready(function() {
 				$('.datepicker').daterangepicker({
@@ -59,42 +93,5 @@
 				}
 			}
 		</script>
-	</head>
-	<body>
-		<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
-			<form name="form1" action="makehtml_m_all.php" target="stafrm" method="post">
-				<input type="hidden" name="action" value="make">
-				<tr>
-					<td bgcolor="#f5f5f5" colspan="2">更新整站</td>
-				</tr>
-				<tr>
-					<td width="260">更新选项：</td>
-					<td>
-						<label><input type="radio" name="uptype" id="uptype1" onClick="SelUp()" value="time" checked="checked"> 指定时间的所有更新</label>
-						<label><input type="radio" name="uptype" id="uptype2" onClick="SelUp()" value="id"> 指定文档的所有更新</label>
-						<label><input type="radio" name="uptype" id="uptype3" onClick="SelUp()" value="mkall"> 更新所有</label>
-					</td>
-				</tr>
-				<tr id="seltime">
-					<td>起始时间：</td>
-					<td><input type="text" name="starttime" id="starttime" value="<?php echo GetDateMk(time());?>" class="datepicker" class="admin-input-sm"></td>
-				</tr>
-				<tr id="selid" style="display:none">
-					<td>起始id：</td>
-					<td><input type="text" name="startid" id="startid" value="0" class="admin-input-sm"></td>
-				</tr>
-				<tr>
-					<td bgcolor="#e9ecef" colspan="2" align="center"><button type="submit" class="btn btn-success btn-sm">开始更新</button></td>
-				</tr>
-			</form>
-			<tr>
-				<td colspan="2">结果：</td>
-			</tr>
-			<tr>
-				<td colspan="2" id="mtd">
-					<div id="mdv" class="admin-win-iframe"><iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="360px"></iframe></div>
-				</td>
-			</tr>
-		</table>
 	</body>
 </html>

admin/templets/makehtml_m_archives.htm

@@ -9,8 +9,8 @@
 		<link rel="stylesheet" href="../static/web/css/admin.css">
 	</head>
 	<body>
-		<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
-			<form name="form1" action="makehtml_m_archives_action.php" method="get" target="stafrm">
+		<form name="form1" action="makehtml_m_archives_action.php" method="get" target="stafrm">
+			<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
 				<tr>
 					<td bgcolor="#f5f5f5" colspan="2">更新文档</td>
 				</tr>
@@ -43,15 +43,12 @@
 				<tr>
 					<td bgcolor="#e9ecef" colspan="2" align="center"><button type="submit" name="b112" class="btn btn-success btn-sm">开始更新</button></td>
 				</tr>
-			</form>
-			<tr>
-				<td colspan="2">结果：</td>
-			</tr>
-			<tr>
-				<td colspan="2" id="mtd">
-					<div id="mdv" class="admin-win-iframe"><iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe></div>
-				</td>
-			</tr>
-		</table>
+				<tr>
+					<td colspan="2" id="mtd">
+						<div id="mdv" class="admin-win-iframe"><iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe></div>
+					</td>
+				</tr>
+			</table>
+		</form>
 	</body>
 </html>

admin/templets/makehtml_m_config.htm

@@ -4,15 +4,15 @@
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
 		<title>手机端配置</title>
-		<script src="../static/web/js/jquery.min.js"></script>
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/css/admin.css">
+		<script src="../static/web/js/jquery.min.js"></script>
 	</head>
 	<body>
-		<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
-			<form action="makehtml_m_config.php" method="post" name="form1" _lpchecked="1">
-				<input type="hidden" name="dopost" value="save">
+		<form action="makehtml_m_config.php" method="post" name="form1" _lpchecked="1">
+			<input type="hidden" name="dopost" value="save">
+			<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
 				<tr>
 					<td bgcolor="#f5f5f5" colspan="3">手机端配置</td>
 				</tr>
@@ -75,7 +75,7 @@
 						<button type="button" class="btn btn-outline-success btn-sm" onclick="document.form1.reset()">重置</button>
 					</td>
 				</tr>
-			</form>
-		</table>
+			</table>
+		</form>
 	</body>
 </html>

admin/templets/makehtml_m_list.htm

@@ -9,8 +9,8 @@
 		<link rel="stylesheet" href="../static/web/css/admin.css">
 	</head>
 	<body>
-		<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
-			<form name="form1" action="makehtml_m_list_action.php" method="get" target="stafrm">
+		<form name="form1" action="makehtml_m_list_action.php" method="get" target="stafrm">
+			<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
 				<tr>
 					<td bgcolor="#f5f5f5" colspan="2">更新栏目</td>
 				</tr>
@@ -42,15 +42,12 @@
 				<tr>
 					<td bgcolor="#e9ecef" colspan="2" align="center"><button type="submit" name="b112" class="btn btn-success btn-sm">开始更新</button></td>
 				</tr>
-			</form>
-			<tr>
-				<td colspan="2">结果：</td>
-			</tr>
-			<tr>
-				<td colspan="2" id="mtd">
-					<div id="mdv" class="admin-win-iframe"><iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe></div>
-				</td>
-			</tr>
-		</table>
+				<tr>
+					<td colspan="2" id="mtd">
+						<div id="mdv" class="admin-win-iframe"><iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe></div>
+					</td>
+				</tr>
+			</table>
+		</form>
 	</body>
 </html>

system/archive/archives.class.php

@@ -1,7 +1,7 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
 /**
- * 文档类
+ * 文档
  *
  * @version        $id:archives.class.php 4 15:13 2010年7月7日 tianya $
  * @package        DedeBIZ.Libraries

system/archive/archives.m.class.php

@@ -1,7 +1,7 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
 /**
- * 手机端文档类
+ * 手机端文档
  *
  * @version        $id:archives.m.class.php 10:46 2023年1月10日 xushubieli $
  * @package        DedeBIZ.Libraries

system/archive/listview.class.php

@@ -1,7 +1,7 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
 /**
- * 文档列表类
+ * 文档列表
  *
  * @version        $id:listview.class.php 2 15:15 2010年7月7日 tianya $
  * @package        DedeBIZ.Libraries

system/archive/listview.m.class.php

@@ -1,7 +1,7 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
 /**
- * 手机端文档列表类
+ * 手机端文档列表
  *
  * @version        $id:listview.m.class.php 10:46 2023年1月10日 xushubieli $
  * @package        DedeBIZ.Libraries

system/archive/searchview.class.php

@@ -1,7 +1,7 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
 /**
- * 搜索视图类
+ * 搜索视图
  *
  * @version        $id:searchview.class.php 15:26 2010年7月7日 tianya $
  * @package        DedeBIZ.Libraries

system/archive/sglistview.class.php

@@ -1,7 +1,7 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
 /**
- * 自定义模型列表类
+ * 自定义模型列表
  *
  * @version        $id:sglistview.class.php 15:48 2010年7月7日 tianya $
  * @package        DedeBIZ.Libraries