From 72619594ebeb874f3b499d027635076bbfd411cc 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?= <2449271624@qq.com> Date: Tue, 12 Sep 2023 14:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/actionsearch_class.php | 12 +-- src/admin/article_string_mix.php | 43 --------- src/admin/css/codemirror.css | 2 +- src/admin/css/login.min.css | 2 +- src/admin/inc/inc_action_info.php | 87 +----------------- src/admin/inc/inc_menu.php | 1 - src/admin/index_body.php | 4 +- src/admin/index_testenv.php | 4 +- src/admin/templets/adtype_main.htm | 4 +- src/admin/templets/album_add.htm | 2 +- src/admin/templets/album_edit.htm | 2 +- src/admin/templets/archives_add.htm | 2 +- src/admin/templets/archives_edit.htm | 2 +- src/admin/templets/archives_sg_add.htm | 2 +- src/admin/templets/archives_sg_edit.htm | 2 +- src/admin/templets/article_add.htm | 6 +- src/admin/templets/article_edit.htm | 2 +- src/admin/templets/catalog_add.htm | 12 +-- src/admin/templets/catalog_edit.htm | 8 +- src/admin/templets/diy_list.htm | 4 +- src/admin/templets/diy_main.htm | 2 +- src/admin/templets/freelist_add.htm | 12 +-- src/admin/templets/freelist_edit.htm | 10 +- src/admin/templets/makehtml_homepage.htm | 4 +- src/admin/templets/mychannel_field_add.htm | 2 +- src/admin/templets/mychannel_field_edit.htm | 2 +- src/admin/templets/soft_add.htm | 2 +- src/admin/templets/soft_edit.htm | 2 +- src/admin/templets/spec_add.htm | 2 +- src/admin/templets/spec_edit.htm | 2 +- src/admin/templets/stepselect_main.htm | 19 ++-- src/admin/templets/tag_test.htm | 2 +- src/static/web/css/admin.css | 3 - src/static/web/css/style.css | 3 - src/system/archive/archives.class.php | 1 - src/system/downmix.inc.php | 14 --- src/system/helpers/downmix.helper.php | 96 -------------------- src/system/typelink/typeunit.class.admin.php | 12 +-- src/theme/apps/list_diyform.htm | 2 +- src/theme/dedebiz/index.htm | 2 +- 40 files changed, 75 insertions(+), 322 deletions(-) delete mode 100644 src/admin/article_string_mix.php delete mode 100755 src/system/downmix.inc.php delete mode 100755 src/system/helpers/downmix.helper.php diff --git a/src/admin/actionsearch_class.php b/src/admin/actionsearch_class.php index f311b631..837d041a 100644 --- a/src/admin/actionsearch_class.php +++ b/src/admin/actionsearch_class.php @@ -49,11 +49,10 @@ class ActionSearch //进行权限判断 if (TestPurview($val['purview'])) { //如果有操作权限 - if ($this->_strpos($val['title'], $this->keyword) !== false || $this->_strpos($val['description'], $this->keyword) !== false) { + if ($this->_strpos($val['title'], $this->keyword) !== false) { //一级项目匹配 $this->result[$i]['toptitle'] = $this->redColorKeyword($this->asarray[$key]['toptitle']); $this->result[$i]['title'] = $this->redColorKeyword($this->asarray[$key]['title']); - $this->result[$i]['description'] = $this->redColorKeyword($this->asarray[$key]['description']); //二级项目匹配 $this->result[$i]['soniterm'][] = $this->redColorKeyword($val); } @@ -74,13 +73,8 @@ class ActionSearch { if (is_array($text)) { foreach ($text as $key => $value) { - if ($key == 'title' || $key == 'description') { - //仅对title,description进行数组替换 - if ($key == 'description') { - $text[$key] = str_replace($this->keyword, ''.$this->keyword.'', $text[$key]); - } else { - $text[$key] = str_replace($this->keyword, ''.$this->keyword.'', $text[$key]); - } + if ($key == 'title') { + $text[$key] = str_replace($this->keyword, ''.$this->keyword.'', $text[$key]); } } } else { diff --git a/src/admin/article_string_mix.php b/src/admin/article_string_mix.php deleted file mode 100644 index b5c78be8..00000000 --- a/src/admin/article_string_mix.php +++ /dev/null @@ -1,43 +0,0 @@ -alert('成功保存字符串混淆');"; -} -//读出 -if (empty($allsource) && filesize($m_file) > 0) { - $fp = fopen($m_file, 'r'); - $allsource = fread($fp, filesize($m_file)); - fclose($fp); -} -make_hash(); -$wecome_info = "防采集工具"; -$win = new OxWindow(); -$win->Init('article_string_mix.php', 'js/blank.js', 'POST'); -$win->AddHidden('dopost', 'save'); -$win->AddHidden('token', $_SESSION['token']); -$win->AddTitle("
启用字符串混淆来防采集功能，文档模板需要的字段加上function='RndString(@me)'属性，如：{dede:field name='body' function='RndString(@me)'/}
"); -$win->AddMsgItem(""); -$winform = $win->GetWindow('ok'); -$win->Display(); -?> \ No newline at end of file diff --git a/src/admin/css/codemirror.css b/src/admin/css/codemirror.css index e356527c..a621931f 100644 --- a/src/admin/css/codemirror.css +++ b/src/admin/css/codemirror.css @@ -3,7 +3,7 @@ .CodeMirror { /* Set height, width, borders, and global font properties here */ font-family: monospace; - height: 400px; + height: 350px; color: black; direction: ltr; } diff --git a/src/admin/css/login.min.css b/src/admin/css/login.min.css index e4c2f91f..9f60796a 100644 --- a/src/admin/css/login.min.css +++ b/src/admin/css/login.min.css @@ -1 +1 @@ -body{line-height:1.6;letter-spacing:.6px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2{line-height:1.2;font-size:24px;color:#393d49;font-weight:600}.btn,input,select{font-size:14px!important}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.logo,.form-control{height:36px}.login-from{margin:5rem auto;width:500px}.login-box{padding:1.25rem;background:#fff}.login-box,.form-control,.btn-md,.alert,.rounded{border-radius:.5rem!important}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}#validateimg{border-radius:0 .5rem .5rem 0;cursor:pointer}#browsehappy{padding:1rem 30px;font-size:14px;color:#856404;background:#fff3cd}.browsehappy-close{float:right;font-size:14px;cursor:pointer}@media (max-width:760px){.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}.login-from{width:100%}} \ No newline at end of file +body{line-height:1.6;letter-spacing:0.6px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2{line-height:1.2;font-size:24px;color:#393d49;font-weight:600}.btn,input,select{font-size:14px!important}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.logo,.form-control{height:36px}.login-from{margin:5rem auto;width:500px}.login-box{padding:1.25rem;background:#fff}.login-box,.form-control,.btn-md,.alert,.rounded{border-radius:.5rem!important}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}#validateimg{border-radius:0 .5rem .5rem 0;cursor:pointer}#browsehappy{padding:1rem 30px;font-size:14px;color:#856404;background:#fff3cd}.browsehappy-close{float:right;font-size:14px;cursor:pointer}@media (max-width:760px){.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}.login-from{width:100%}} \ No newline at end of file diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php index b62abeaf..fd83ec79 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -13,41 +13,34 @@ $cuserLogin = new userLogin(); //后台功能操作配置项 $actionSearch[0] = array( 'title' => '常用操作', - 'description' => '后台常用操作', 'soniterm' => array( 0 => array( 'title' => '网站栏目管理', - 'description' => '网站所有栏目管理', 'purview' => 't_List,t_AccList', 'linkurl' => 'catalog_main.php' ), 1 => array( 'title' => '待审核的文档', - 'description' => '所有文档模型发表未审核列表', 'purview' => 'a_Check,a_AccCheck', 'linkurl' => 'content_list.php?arcrank=-1' ), 2 => array( 'title' => '我发布的文档', - 'description' => '后台管理登录所发表的文档', 'purview' => 'a_List,a_AccList,a_MyList', 'linkurl' => 'content_list.php?mid=$cuserLogin->userID' ), 3 => array( 'title' => '标签管理', - 'description' => '网站所有标签管理', 'purview' => 'sys_Keyword', 'linkurl' => 'tags_main.php' ), 4 => array( 'title' => '评论管理', - 'description' => '网站所有评论管理', 'purview' => 'sys_Feedback', 'linkurl' => 'feedback_main.php' ), 5 => array( 'title' => '专题管理', - 'description' => '网站所有专题管理', 'purview' => 'spec_New', 'linkurl' => 'content_s_list.php' ), @@ -61,23 +54,14 @@ $actionSearch[0] = array( ); $actionSearch[2] = array( 'title' => '附件管理', - 'description' => '网站所有附件管理', 'soniterm' => array( 0 => array( - 'title' => '上传新文件', - 'description' => '上传图片、FLASH、视频音频、附件等其它附件', - 'purview' => '', - 'linkurl' => 'media_add.php' - ), - 1 => array( 'title' => '附件管理', - 'description' => '网站所有附件管理', 'purview' => 'sys_Upload,sys_MyUpload', 'linkurl' => 'media_main.php' ), - 2 => array( + 1 => array( 'title' => '文件管理器', - 'description' => '文件浏览式附件管理', 'purview' => 'plus_文件管理器', 'linkurl' => 'media_main.php?dopost=filemanager' ), @@ -85,41 +69,34 @@ $actionSearch[2] = array( ); $actionSearch[3] = array( 'title' => '文档模型', - 'description' => '所有文档模型管理', 'soniterm' => array( 0 => DEDEBIZ_SAFE_MODE? null : array( 'title' => '文档模型管理', - 'description' => '网站文档、图片、软件、专题、分类等模型管理', 'purview' => 'c_List', 'linkurl' => 'mychannel_main.php' ), 1 => array( 'title' => '文档单页管理', - 'description' => '创建和管理单页面', 'purview' => 'temp_One', 'linkurl' => 'templets_one.php' ), 2 => array( 'title' => '联动类型管理', - 'description' => '创建和管理所有联动类型', 'purview' => 'c_Stepseclect', 'linkurl' => 'stepselect_main.php?dopost=filemanager' ), 3 => array( 'title' => '自由列表管理', - 'description' => '创建不同的列表形式', 'purview' => 'c_List', 'linkurl' => 'freelist_main.php' ), 3 => array( 'title' => '自定义文档属性', - 'description' => '自定义文档属性管理', 'purview' => 'sys_Att', 'linkurl' => 'content_att.php' ), 4 => array( 'title' => '自定义表单管理', - 'description' => '创建和管理自定义表单', 'purview' => 'c_List', 'linkurl' => 'diy_main.php' ), @@ -127,41 +104,34 @@ $actionSearch[3] = array( ); $actionSearch[4] = array( 'title' => '批量维护', - 'description' => '网站数据维护', 'soniterm' => array( 0 => array( 'title' => '文档批量维护', - 'description' => '某个栏目或者全部栏目的文档进行批量审核文档、更新网页、移动文档、删除文档', 'purview' => 'sys_ArcBatch', 'linkurl' => 'content_batch_up.php' ), 1 => array( 'title' => '文档重复检测', - 'description' => '网站重复标题文档处理', 'purview' => 'sys_ArcBatch', 'linkurl' => 'article_test_same.php' ), 3 => array( 'title' => '文档关键词维护', - 'description' => '所有文档关键词批量维护', 'purview' => 'sys_Keyword', 'linkurl' => 'article_keywords_main.php' ), 4 => array( 'title' => '搜索关键词维护', - 'description' => '所有搜索关键词管理', 'purview' => 'sys_Keyword', 'linkurl' => 'search_keywords_main.php?dopost=filemanager' ), 5 => array( 'title' => '自动摘要分页', - 'description' => '没有填写描述的文档或没分页的文档的自动分页标识自动更新', 'purview' => 'sys_Keyword', 'linkurl' => 'article_description_main.php' ), 6 => DEDEBIZ_SAFE_MODE? null : array( 'title' => '数据库字段替换', - 'description' => '网站数据库字段批量替换', 'purview' => 'sys_ArcBatch', 'linkurl' => 'sys_data_replace.php' ), @@ -169,29 +139,24 @@ $actionSearch[4] = array( ); $actionSearch[5] = array( 'title' => '会员管理', - 'description' => '网站所有会员管理', 'soniterm' => array( 0 => array( 'title' => '所有会员列表', - 'description' => '所有会员修改删除，查看会员文档以及提升管理员', 'purview' => 'member_List', 'linkurl' => 'member_main.php' ), 1 => array( 'title' => '会员短信管理', - 'description' => '会员发送的短消息，其中包含群发短消息和对单个会员发送短消息两种', 'purview' => 'member_Type', 'linkurl' => 'member_pm.php' ), 2 => array( 'title' => '会员级别设置', - 'description' => '会员级别设置，通过不同会员的浏览权限来对会员级别进行一个扩展', 'purview' => 'member_Type', 'linkurl' => 'member_rank.php' ), 3 => array( 'title' => '积分头衔设置', - 'description' => '会员积分等级设置，根据活动积分对会员进行头衔管理', 'purview' => 'member_Type', 'linkurl' => 'member_scores.php' ), @@ -199,35 +164,29 @@ $actionSearch[5] = array( ); $actionSearch[6] = array( 'title' => '支付工具', - 'description' => '配置支付方式', 'soniterm' => array( 0 => array( 'title' => '积分产品管理', - 'description' => '网站积分产品管理，生成积分以及查看积分使用状态', 'purview' => 'sys_Data', 'linkurl' => 'cards_manage.php' ), 1 => array( 'title' => '积分产品分类', - 'description' => '网站积分产品分类，添加不同点数的积分产品类型', 'purview' => 'sys_Data', 'linkurl' => 'cards_type.php' ), 2 => array( 'title' => '会员消费记录', - 'description' => '会员消费记录，查看消费充值订单的付款情况', 'purview' => 'sys_Data', 'linkurl' => 'member_operations.php' ), 3 => array( 'title' => '会员等级分类', - 'description' => '会员等级分类划分，设置网站会员等级', 'purview' => 'sys_Data', 'linkurl' => 'member_type.php' ), 4 => array( 'title' => '支付接口设置', - 'description' => '网站支付接口配置', 'purview' => 'sys_Data', 'linkurl' => 'sys_payment.php' ), @@ -235,41 +194,34 @@ $actionSearch[6] = array( ); $actionSearch[7] = array( 'title' => '更新任务', - 'description' => '一键生成静态管理', 'soniterm' => array( 0 => array( 'title' => '更新网站', - 'description' => '生成所有静态页面', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_all.php' ), 1 => array( 'title' => '更新首页', - 'description' => '生成网站首页面', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_homepage.php' ), 2 => array( 'title' => '更新栏目', - 'description' => '生成栏目页面', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_list.php' ), 3 => array( 'title' => '更新文档', - 'description' => '生成文档页面', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_archives.php' ), 4 => array( 'title' => '更新专题', - 'description' => '生成专题页面', 'purview' => 'sys_MakeHtml', 'linkurl' => 'makehtml_spec.php' ), 5 => array( 'title' => '更新缓存', - 'description' => '更新栏目缓存、更新枚举缓存、清理文档调用缓存、清理过期会员浏览历史、删除过期会员短信', 'purview' => 'sys_ArcBatch', 'linkurl' => 'sys_cache_up.php' ), @@ -277,35 +229,29 @@ $actionSearch[7] = array( ); $actionSearch[8] = DEDEBIZ_SAFE_MODE? null : array( 'title' => '模板管理', - 'description' => '网站主题模板管理', 'soniterm' => array( 0 => array( 'title' => '默认模板管理', - 'description' => '网站主题模板文件管理', 'purview' => 'temp_All', 'linkurl' => 'templets_main.php' ), 1 => array( 'title' => '标签源码管理', - 'description' => '系统标签文件修改', 'purview' => 'temp_All', 'linkurl' => 'templets_tagsource.php' ), 2 => array( 'title' => '自定义宏标记', - 'description' => '所有自定义标记管理', 'purview' => 'temp_MyTag', 'linkurl' => 'mytag_main.php' ), 3 => array( 'title' => '智能标记向导', - 'description' => '根据需要生成相应的调用标签', 'purview' => 'temp_Other', 'linkurl' => 'mytag_tag_guide.php' ), 4 => array( 'title' => '全局标记测试', - 'description' => '全局标签调用测试', 'purview' => 'temp_Test', 'linkurl' => 'tag_test.php' ), @@ -313,77 +259,54 @@ $actionSearch[8] = DEDEBIZ_SAFE_MODE? null : array( ); $actionSearch[9] = array( 'title' => '系统设置', - 'description' => '后台系统设置', 'soniterm' => array( 0 => array( 'title' => '系统设置', - 'description' => '站点设置、核心设置、附件设置、会员设置、互动设置、性能选项、其它选项、添加新变量等功能设置', 'purview' => 'sys_Edit', 'linkurl' => 'sys_info.php' ), 1 => array( 'title' => '管理员管理', - 'description' => '网站管理员管理', 'purview' => 'sys_User', 'linkurl' => 'sys_admin_user.php' ), 2 => array( 'title' => '会员组管理', - 'description' => '网站管理员组权限管理', 'purview' => 'sys_Group', 'linkurl' => 'sys_group.php' ), 3 => array( 'title' => '日志管理', - 'description' => '登录后台管理员操作进行记录', 'purview' => 'sys_Log', 'linkurl' => 'log_list.php' ), 5 => array( 'title' => '图片水印设置', - 'description' => '上传图片添加水印设置', 'purview' => 'sys_Edit', 'linkurl' => 'sys_info_mark.php' ), - /*5 => array( - 'title' => '云服务设置', - 'description' => '主流云服务平台支持', - 'purview' => 'sys_Edit', - 'linkurl' => 'sys_cloud.php' - ),*/ 6 => array( 'title' => '软件下载设置', - 'description' => '软件下载连接显示方式，下载方式等配置', 'purview' => 'sys_SoftConfig', 'linkurl' => 'soft_config.php' ), - 7 => array( - 'title' => '防采集工具', - 'description' => '网站防采集工具', - 'purview' => 'sys_StringMix', - 'linkurl' => 'article_string_mix.php' - ), - 8 => DEDEBIZ_SAFE_MODE? null : array( + 7 => DEDEBIZ_SAFE_MODE? null : array( 'title' => '数据库备份还原', - 'description' => '数据库备份和还原数据备份', 'purview' => 'sys_data', 'linkurl' => 'sys_data.php' ), - 9 => DEDEBIZ_SAFE_MODE? null : array( + 8 => DEDEBIZ_SAFE_MODE? null : array( 'title' => 'SQL命令工具', - 'description' => '数据表执行单行或者多行的SQL语句', 'purview' => 'sys_data', 'linkurl' => 'sys_sql_query.php' ), - 10 => array( + 9 => array( 'title' => '文件扫描工具', - 'description' => '以DedeBIZ开发模式为标准对现有的文件进行扫描判断', 'purview' => 'sys_verifies', 'linkurl' => 'sys_safetest.php' ), - 11 => array( + 10 => array( 'title' => '系统修复工具', - 'description' => '手动和自动升级错误处理', 'purview' => 'sys_verifies', 'linkurl' => 'sys_repair.php' ), diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index 7d9c20c1..4bdb3aa7 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -64,7 +64,6 @@ if ($cuserLogin->getUserType() >= 10) { - ".(DEDEBIZ_SAFE_MODE? "" : "")." ".(DEDEBIZ_SAFE_MODE? "" : "")." diff --git a/src/admin/index_body.php b/src/admin/index_body.php index ef5407ec..c9915e31 100644 --- a/src/admin/index_body.php +++ b/src/admin/index_body.php @@ -50,10 +50,10 @@ if (empty($dopost)) { if (count($arcArr) > 0) { foreach($arcArr as $row) { - if (trim($row['editcon'])=='') { + if (trim($row['editcon']) == '') { $row['editcon'] = 'archives_edit.php'; } - $rowarcrank = $row['arcrank']==-1? "未审核":""; + $rowarcrank = $row['arcrank'] == -1? " 未审核" : ""; $pubdate = GetDateMk($row['pubdate']); echo "{$row['title']}{$rowarcrank}{$pubdate}"; } diff --git a/src/admin/index_testenv.php b/src/admin/index_testenv.php index d2071584..84579964 100644 --- a/src/admin/index_testenv.php +++ b/src/admin/index_testenv.php @@ -123,7 +123,7 @@ if (!function_exists('IsWritable')) { $safeMsg = array(); $dirname = str_replace('index_body.php', '', strtolower($_SERVER['PHP_SELF'])); if (!DEDEBIZ_SAFE_MODE) { - $safeMsg[] = '系统运行环境为开发模式，建议您启用安全模式详情'; + $safeMsg[] = '系统运行环境为开发模式，建议您启用安全模式 详情'; } if (!IsSSL()) { $safeMsg[] = '检测到网址非安全链接，建议您部署https'; @@ -139,7 +139,7 @@ if (preg_match("#[\\|/]admin[\\|/]#", $dirname)) { } $rs = TestAdminPWD(); if ($rs < 0) { - $linkurl = '修改'; + $linkurl = ' 修改'; switch ($rs) { case -1: $msg = "检测到默认账号没有修改，建议您修改{$linkurl}"; diff --git a/src/admin/templets/adtype_main.htm b/src/admin/templets/adtype_main.htm index bfdef888..35e109dc 100644 --- a/src/admin/templets/adtype_main.htm +++ b/src/admin/templets/adtype_main.htm @@ -12,7 +12,7 @@
- + @@ -28,7 +28,7 @@ $k++; ?> - + diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index e65254bb..0b5185f5 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -95,7 +95,7 @@ diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm index 5a6cd554..178b18ca 100644 --- a/src/admin/templets/article_edit.htm +++ b/src/admin/templets/article_edit.htm @@ -96,7 +96,7 @@ diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index a6c51677..516e5bf7 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -152,9 +152,9 @@ diff --git a/src/admin/templets/diy_list.htm b/src/admin/templets/diy_list.htm index f0fd18d3..f2fda35d 100644 --- a/src/admin/templets/diy_list.htm +++ b/src/admin/templets/diy_list.htm @@ -38,8 +38,8 @@ diff --git a/src/admin/templets/diy_main.htm b/src/admin/templets/diy_main.htm index 12763fa9..50f4bba5 100644 --- a/src/admin/templets/diy_main.htm +++ b/src/admin/templets/diy_main.htm @@ -34,7 +34,7 @@ {/dede:datalist} - + diff --git a/src/admin/templets/freelist_add.htm b/src/admin/templets/freelist_add.htm index 011df644..d5be6846 100644 --- a/src/admin/templets/freelist_add.htm +++ b/src/admin/templets/freelist_add.htm @@ -65,7 +65,7 @@ @@ -144,9 +144,9 @@ @@ -162,8 +162,8 @@ - - + + diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm index 60eb9009..a89599d3 100644 --- a/src/admin/templets/freelist_edit.htm +++ b/src/admin/templets/freelist_edit.htm @@ -137,9 +137,9 @@ if ($setype=='') $setype = 'X'; ?> 高级筛选： - - - + + + @@ -167,8 +167,8 @@ - - + + diff --git a/src/admin/templets/makehtml_homepage.htm b/src/admin/templets/makehtml_homepage.htm index 4240352d..d83f3ec2 100644 --- a/src/admin/templets/makehtml_homepage.htm +++ b/src/admin/templets/makehtml_homepage.htm @@ -54,7 +54,7 @@ if ($data->code == -1) { ?> - + - + diff --git a/src/admin/templets/mychannel_field_add.htm b/src/admin/templets/mychannel_field_add.htm index 8b66346c..c863d17d 100644 --- a/src/admin/templets/mychannel_field_add.htm +++ b/src/admin/templets/mychannel_field_add.htm @@ -105,7 +105,7 @@ } ?> - + diff --git a/src/admin/templets/mychannel_field_edit.htm b/src/admin/templets/mychannel_field_edit.htm index f4409ab5..d8712163 100644 --- a/src/admin/templets/mychannel_field_edit.htm +++ b/src/admin/templets/mychannel_field_edit.htm @@ -117,7 +117,7 @@ } ?> - + diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index 5979a3c8..2f20e61a 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -106,7 +106,7 @@
广告分类管理广告管理广告分类管理
id
id;?>id;?>
缩略图： - + 上传图片 diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index 0795bfba..e4582aa5 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -96,7 +96,7 @@ 缩略图： - + 上传图片 diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index 3de7add6..c6122ec2 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -90,7 +90,7 @@ 缩略图： - + 上传图片 diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm index 1cd34393..5f2fd3f2 100644 --- a/src/admin/templets/archives_edit.htm +++ b/src/admin/templets/archives_edit.htm @@ -92,7 +92,7 @@ 缩略图： - + 上传图片 diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm index 836a6bba..5a28f73e 100644 --- a/src/admin/templets/archives_sg_add.htm +++ b/src/admin/templets/archives_sg_add.htm @@ -63,7 +63,7 @@ 缩略图： - + 上传图片 diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm index ffe60d1a..134138a7 100644 --- a/src/admin/templets/archives_sg_edit.htm +++ b/src/admin/templets/archives_sg_edit.htm @@ -67,7 +67,7 @@ 缩略图： - + 上传图片 diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index 54f007ca..50804018 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -89,7 +89,7 @@ 缩略图： - + 上传图片 @@ -207,8 +207,8 @@
分页方式： - - + +
缩略图： - + 上传图片 diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index dc9aaa6c..00c88517 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -167,9 +167,9 @@ 栏目交叉： - - - + + +
@@ -266,9 +266,9 @@ 		是否支持跨站调用： - - - + + +
栏目交叉： - - - + + +
@@ -251,7 +251,7 @@ - +
- - + + 预览
添加自定义表单添加自定义表单
{dede:pagelist listsize='6'/}目录默认页名称： - +
- - - + + +
启动商业组件失败，如何启动组件启动商业组件失败 如何启动组件
启动商业组件失败启动组件启动商业组件失败 启动组件
缩略图： - + 上传图片 diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index d41abc0e..8095c59e 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -108,7 +108,7 @@ 缩略图： - + 上传图片 diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm index 09f6f758..278e688d 100644 --- a/src/admin/templets/spec_add.htm +++ b/src/admin/templets/spec_add.htm @@ -110,7 +110,7 @@ 缩略图： - + 上传图片 diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm index b771547f..3593b8e0 100644 --- a/src/admin/templets/spec_edit.htm +++ b/src/admin/templets/spec_edit.htm @@ -110,7 +110,7 @@ 缩略图： - + 上传图片 diff --git a/src/admin/templets/stepselect_main.htm b/src/admin/templets/stepselect_main.htm index 2c5788b8..10c66dfd 100644 --- a/src/admin/templets/stepselect_main.htm +++ b/src/admin/templets/stepselect_main.htm @@ -189,9 +189,6 @@ if ($topvalue % 500 != 0) $arr['issign'] = 2; ?> - - - diff --git a/src/admin/templets/tag_test.htm b/src/admin/templets/tag_test.htm index b9cafa7a..4c353c85 100644 --- a/src/admin/templets/tag_test.htm +++ b/src/admin/templets/tag_test.htm @@ -29,7 +29,7 @@ if (empty($cid)) $cid="0"; $tl = new TypeLink($cid); $typeOptions = $tl->GetOptionArray($cid,$admin_catalogs,0); - echo ""; if ($cid=="0") echo ""; echo $typeOptions; echo ""; diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index f1f243ef..a00da5f6 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -531,9 +531,6 @@ body.hidemenu .body-right { color:inherit; cursor:pointer } -.l-height-30 { - line-height:30px -} .list-group-item { padding:0.5rem 0 } diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index e4226cf7..689332d5 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -374,9 +374,6 @@ input[type=file] { .btn+.btn { margin-left:10px } -.l-height-30 { - line-height:30px -} .input-text { height:36px; line-height:36px diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php index 8ead2e2b..2ab22fed 100755 --- a/src/system/archive/archives.class.php +++ b/src/system/archive/archives.class.php @@ -11,7 +11,6 @@ if (!defined('DEDEINC')) exit ('dedebiz'); */ require_once(DEDEINC."/typelink/typelink.class.php"); require_once(DEDEINC."/channelunit.class.php"); -require_once(DEDEINC."/downmix.inc.php"); @set_time_limit(0); class Archives { diff --git a/src/system/downmix.inc.php b/src/system/downmix.inc.php deleted file mode 100755 index be2fac2d..00000000 --- a/src/system/downmix.inc.php +++ /dev/null @@ -1,14 +0,0 @@ - \ No newline at end of file diff --git a/src/system/helpers/downmix.helper.php b/src/system/helpers/downmix.helper.php deleted file mode 100755 index 5565036d..00000000 --- a/src/system/helpers/downmix.helper.php +++ /dev/null @@ -1,96 +0,0 @@ - $rndstyleValue \r\n"; - //附机标记 - $rndem[1] = 'font'; - $rndem[2] = 'div'; - $rndem[3] = 'span'; - $rndem[4] = 'p'; - //读取字符串数据 - $fp = fopen(DEDEDATA.'/downmix.data.inc', 'r'); - $start = 0; - $totalitem = 0; - while (!feof($fp)) { - $v = trim(fgets($fp, 128)); - if ($start == 1) { - if (preg_match("/#end#/i", $v)) { - break; - } - if ($v != '') { - $totalitem++; - $rndstring[$totalitem] = preg_replace("/#,/", "", $v); - } - } - if (preg_match("/#start#/i", $v)) { - $start = 1; - } - } - fclose($fp); - //处理要防采集的字段 - $bodylen = strlen($body) - 1; - $prepos = 0; - for ($i = 0; $i <= $bodylen; $i++) { - if ($i + 2 >= $bodylen || $i < 50) { - $reString .= $body[$i]; - } else { - $ntag = @strtolower($body[$i].$body[$i + 1].$body[$i + 2]); - if ($ntag == ' $maxpos)) { - $dd = mt_rand(1, 4); - $emname = $rndem[$dd]; - $dd = mt_rand(1, $totalitem); - $rnstr = $rndstring[$dd]; - if ($emname != 'font') { - $rnstr = " <$emname class='$rndstyleName'>$rnstr "; - } else { - $rnstr = " $rnstr"; - } - $reString .= $rnstr.$body[$i]; - $prepos = $i; - } else { - $reString .= $body[$i]; - } - } - } - return $reString; - } //函数结束 -} -?> \ No newline at end of file diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index e4c61eab..cd5d911c 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/src/system/typelink/typeunit.class.admin.php @@ -110,7 +110,7 @@ class TypeUnit if ($ispart == 0) { //列表栏目 echo ""; - echo "
联动枚举组管理
- 子分类管理 @@ -210,14 +207,14 @@ - 隶属分类： - - - 分类名称： - + 隶属分类： + + 分类名称： + +
列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; + echo ""; echo ""; - echo "
列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; echo ""; echo ""; @@ -122,7 +122,7 @@ class TypeUnit } else if ($ispart == 1) { //封面栏目 echo "
封面{$nss}".$typeName."[id：".$id."]"; + echo ""; echo ""; - echo "
封面{$nss}".$typeName."[id：".$id."]"; echo ""; echo ""; @@ -134,7 +134,7 @@ class TypeUnit } else if ($ispart == 2) { //外部栏目 echo "
外部{$nss}".$typeName."[id：".$id."]"; + echo ""; echo ""; echo "
外部{$nss}".$typeName."[id：".$id."]"; echo ""; echo ""; @@ -194,7 +194,7 @@ class TypeUnit //列表栏目 echo "
"; echo ""; echo "
"; - echo "$step列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; + echo "$step列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; echo ""; echo ""; @@ -207,7 +207,7 @@ class TypeUnit //封面栏目 echo "
"; echo ""; echo "
"; - echo "$step封面{$nss}".$typeName."[id：".$id."]"; + echo "$step封面{$nss}".$typeName."[id：".$id."]"; echo ""; echo ""; @@ -220,7 +220,7 @@ class TypeUnit //外部栏目 echo "
"; echo "'; + echo ''; foreach($fieldlist as $field=>$fielddata) { if ($fields[$field]=='') continue; diff --git a/src/theme/dedebiz/index.htm b/src/theme/dedebiz/index.htm index 0b3d101b..f6a4a7ac 100644 --- a/src/theme/dedebiz/index.htm +++ b/src/theme/dedebiz/index.htm @@ -60,7 +60,7 @@

[field:flag runphp='yes']if (stristr(@me,"h")) @me="头条";else if(stristr(@me,"c")) @me="推荐";else @me="";[/field:flag][field:title/]

-
+
"; - echo "$step外部{$nss}".$typeName."[id：".$id."]"; + echo "$step外部{$nss}".$typeName."[id：".$id."]"; echo ""; echo ""; diff --git a/src/theme/apps/list_diyform.htm b/src/theme/apps/list_diyform.htm index 0588aca2..85c806b6 100644 --- a/src/theme/apps/list_diyform.htm +++ b/src/theme/apps/list_diyform.htm @@ -25,7 +25,7 @@ "; - echo '
表单'.$fields['id'].'详细
表单'.$fields['id'].' 详细