Merge branch 'adminstyle' into develop

src/admin/tags_main.php

@@ -42,7 +42,6 @@ if (empty($action)) {
     }
     $query = "UPDATE `#@__tagindex` SET `count`='$count',`title`='$title',`keywords`='$keywords',`description`='$description' WHERE id='$tid' ";
     $dsql->ExecuteNoneQuery($query);
-
     $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__tagindex_infos` WHERE tagid = $tid");
     if ($row['dd'] > 0) {
         $dsql->ExecuteNoneQuery("UPDATE `#@__tagindex_infos` SET `litpic`=='$litpic'");

src/admin/templets/tags_main.htm

@@ -65,13 +65,12 @@
 										<td>{dede:field.id/}</td>
 										<td><a href="<?php echo $cfg_phpurl;?>/tags.php?/<?php echo $fields['id'];?>" target="_blank">{dede:sfield.tag/}</a></td>
 										<td>
-											<input value="<?php echo $fields['litpic'];?>" type="text" name="litpic{dede:field.id/}" id="litpic{dede:field.id/}" class="admin-input-sm">
+											<input value="<?php echo $fields['litpic'];?>" type="text" name="litpic{dede:field.id/}" id="litpic{dede:field.id/}" class="form-control w-65">
 											<button type="button" class="btn btn-success btn-sm" onclick="SelectImage('form3.litpic{dede:field.id/}');">选择</button>
 										</td>
-										<td><input type="text" value="<?php echo $fields['title'];?>" name="title<?php echo $fields['id'];?>" id="title<?php echo $fields['id'];?>" class="admin-input-sm"></td>
-										<td><input type="text" value="<?php echo $fields['keywords'];?>" name="keywords<?php echo $fields['id'];?>" id="keywords<?php echo $fields['id'];?>" class="admin-input-sm"></td>
-										<td><textarea name="description<?php echo $fields['id'];?>" id="description<?php echo $fields['id'];?>" class="admin-textarea-sm"><?php echo $fields['description'];?></textarea></td>
-
+										<td><input type="text" value="<?php echo $fields['title'];?>" name="title<?php echo $fields['id'];?>" id="title<?php echo $fields['id'];?>" class="form-control"></td>
+										<td><input type="text" value="<?php echo $fields['keywords'];?>" name="keywords<?php echo $fields['id'];?>" id="keywords<?php echo $fields['id'];?>" class="form-control"></td>
+										<td><textarea name="description<?php echo $fields['id'];?>" id="description<?php echo $fields['id'];?>" class="form-control"><?php echo $fields['description'];?></textarea></td>
 										<td><input type="text" value="<?php echo $fields['count'];?>" id="count<?php echo $fields['id'];?>" class="admin-input-xs"></td>
 										<td><?php echo $fields['total'];?></td>
 										<td><?php echo $fields['addtime'];?></td>

src/install/config.cache.inc.php

@@ -18,8 +18,8 @@ $cfg_softtype = 'zip|gz|rar|iso|doc|xsl|ppt|wps';
 $cfg_mediatype = 'swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov';
 $cfg_specnote = 10;
 $cfg_list_symbol = '';
-$cfg_notallowstr = '渣男|直男';
-$cfg_replacestr = '渣男|直男';
+$cfg_notallowstr = '草泥马|[\*%=]|htt|www|com';
+$cfg_replacestr = '草泥马|[\*%=]|htt|www|com';
 $cfg_feedbackcheck = 'N';
 $cfg_keyword_replace = 'Y';
 $cfg_df_style = 'dedebiz';

src/install/sql-dfdata.txt

@@ -3946,7 +3946,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin
 ('17','cfg_mediatype','允许多媒体上传文件类型','3','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov'),
 ('18','cfg_specnote','专题最大节点数','2','number','10'),
 ('19','cfg_list_symbol','当前位置间隔符号','2','string',''),
-('20','cfg_notallowstr','禁用关键词，用|分开，但不要在结尾加|','5','bstring','渣男|直男'),
+('20','cfg_notallowstr','禁用关键词，支持正则匹配，用|隔开，结尾不要加|','5','bstring','草泥马|[\*%=]|htt|www|com'),
 ('21','cfg_feedbackcheck','是否需审核评论及留言','5','bool','Y'),
 ('22','cfg_keyword_replace','是否使用关键词替换功能，开启影响文档更新速度','2','bool','Y'),
 ('23','cfg_rewrite','是否启用伪静态，开启后必须添加伪静态规则','1','bool','N'),
@@ -3971,7 +3971,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin
 ('42','cfg_cli_time','服务器时区设置','2','number','8'),
 ('43','cfg_mb_addontype','会员附件许可文件类型','4','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov|zip|rar|doc|xsl|ppt|wps'),
 ('44','cfg_mb_max','会员附件总大小限制（MB）','4','number','500'),
-('45','cfg_replacestr','禁用关键词替换成*，用|分开，但不要在结尾加|','5','bstring','渣男|直男'),
+('45','cfg_replacestr','禁用关键词替换成*，支持正则匹配，用|隔开，结尾不要加|','5','bstring','草泥马|[\*%=]|htt|www|com'),
 ('46','cfg_keyword_like','使用关键词关连文档','6','bool','Y'),
 ('47','cfg_index_max','首页调用函数最大索引文档数，不适用于经常单栏目采集网站，不启用设置为0','6','number','10000'),
 ('48','cfg_index_cache','文档标签调用缓存（0不启用，大于0值为多少秒）','6','number','86400'),