fix #865 支持地区和语言的同义词替换

application/admin/controller/System.php

@@ -620,6 +620,8 @@ class System extends Base
             $config_new['collect']['vod']['namewords'] = mac_replace_text($config_new['collect']['vod']['namewords'], 2);
             $config_new['collect']['vod']['thesaurus'] = mac_replace_text($config_new['collect']['vod']['thesaurus'], 2);
             $config_new['collect']['vod']['playerwords'] = mac_replace_text($config_new['collect']['vod']['playerwords'], 2);
+            $config_new['collect']['vod']['areawords'] = mac_replace_text($config_new['collect']['vod']['areawords'], 2);
+            $config_new['collect']['vod']['langwords'] = mac_replace_text($config_new['collect']['vod']['langwords'], 2);
             $config_new['collect']['vod']['words'] = mac_replace_text($config_new['collect']['vod']['words'], 2);
             $config_new['collect']['art']['thesaurus'] = mac_replace_text($config_new['collect']['art']['thesaurus'], 2);
             $config_new['collect']['art']['words'] = mac_replace_text($config_new['collect']['art']['words'], 2);

application/admin/view/system/configcollect.html

@@ -110,6 +110,20 @@
                         <input type="radio" name="collect[vod][pseplayer]" value="1" title="{:lang('open')}" {if condition="$config['collect']['vod']['pseplayer'] eq 1"}checked {/if}>
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{:lang('admin/system/configcollect/psearea')}：</label>
+                    <div class="layui-input-inline">
+                        <input type="radio" name="collect[vod][psearea]" value="0" title="{:lang('close')}" {if condition="$config['collect']['vod']['psearea'] neq 1"}checked {/if}>
+                        <input type="radio" name="collect[vod][psearea]" value="1" title="{:lang('open')}" {if condition="$config['collect']['vod']['psearea'] eq 1"}checked {/if}>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{:lang('admin/system/configcollect/pselang')}：</label>
+                    <div class="layui-input-inline">
+                        <input type="radio" name="collect[vod][pselang]" value="0" title="{:lang('close')}" {if condition="$config['collect']['vod']['pselang'] neq 1"}checked {/if}>
+                        <input type="radio" name="collect[vod][pselang]" value="1" title="{:lang('open')}" {if condition="$config['collect']['vod']['pselang'] eq 1"}checked {/if}>
+                    </div>
+                </div>
 
                 <div class="layui-form-item">
                     <label class="layui-form-label">{:lang('admin/system/configcollect/urlrole')}：</label>
@@ -629,6 +643,20 @@
                     </div>
                 </div>
 
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{:lang('admin/system/configcollect/vod_areawords')}：</label>
+                    <div class="layui-input-block">
+                        <textarea name="collect[vod][areawords]" class="layui-textarea">{$config['collect']['vod']['areawords']|mac_replace_text}</textarea>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{:lang('admin/system/configcollect/vod_langwords')}：</label>
+                    <div class="layui-input-block">
+                        <textarea name="collect[vod][langwords]" class="layui-textarea">{$config['collect']['vod']['langwords']|mac_replace_text}</textarea>
+                    </div>
+                </div>
+
                 <div class="layui-form-item">
                     <label class="layui-form-label">{:lang('admin/system/configcollect/vod_words')}：</label>
                     <div class="layui-input-block">

application/common/model/Collect.php

@@ -435,6 +435,8 @@ class Collect extends Base {
         $pse_name = mac_txt_explain($config['namewords'], true);
         $pse_syn = mac_txt_explain($config['thesaurus'], true);
         $pse_player = mac_txt_explain($config['playerwords'], true);
+        $pse_area = mac_txt_explain($config['areawords'], true);
+        $pse_lang = mac_txt_explain($config['langwords'], true);
 
         foreach($data['data'] as $k=>$v){
             $color='red';
@@ -548,6 +550,12 @@ class Collect extends Base {
                 if ($config['pseplayer'] == 1) {
                     $v['vod_play_from'] = mac_rep_pse_syn($pse_player, $v['vod_play_from']);
                 }
+                if ($config['psearea'] == 1) {
+                    $v['vod_area'] = mac_rep_pse_syn($pse_area, $v['vod_area']);
+                }
+                if ($config['pselang'] == 1) {
+                    $v['vod_lang'] = mac_rep_pse_syn($pse_lang, $v['vod_lang']);
+                }
 
                 if(empty($v['vod_blurb'])){
                     $v['vod_blurb'] = mac_substring( strip_tags($v['vod_content']) ,100);

application/lang/zh-cn.php

@@ -1013,6 +1013,8 @@ https://www.baidu.com/123.jpg
     'admin/system/configcollect/psernd'=>'详情随机插入语句',
     'admin/system/configcollect/psesyn'=>'详情同义词替换',
     'admin/system/configcollect/pseplayer'=>'播放器同义词替换',
+    'admin/system/configcollect/psearea'=>'地区同义词替换',
+    'admin/system/configcollect/pselang'=>'语言同义词替换',
     'admin/system/configcollect/inrule'=>'入库重复规则',
     'admin/system/configcollect/inrule_tip_role'=>'豆瓣ID和视频名称传入按豆瓣ID优先',
     'admin/system/configcollect/inrule_tip_comment'=>'关联数据名称或豆瓣ID传入按豆瓣ID优先（豆瓣ID仅在视频模块起作用）',
@@ -1030,6 +1032,8 @@ https://www.baidu.com/123.jpg
     'admin/system/configcollect/vod_namewords'=>'视频名称同义库',
     'admin/system/configcollect/vod_thesaurus'=>'视频详情同义词库',
     'admin/system/configcollect/vod_playerwords'=>'播放器同义词库',
+    'admin/system/configcollect/vod_areawords'=>'地区同义词库',
+    'admin/system/configcollect/vod_langwords'=>'语言同义词库',
     'admin/system/configcollect/vod_words'=>'视频详情随机词库',
     'admin/system/configcollect/art_thesaurus'=>'文章详情同义词库',
     'admin/system/configcollect/art_words'=>'文章详情随机词库',

application/lang/zh-tw.php

@@ -1013,6 +1013,8 @@ https://www.baidu.com/123.jpg
     'admin/system/configcollect/psernd'=>'詳情隨機插入語句',
     'admin/system/configcollect/psesyn'=>'詳情同義詞替換',
     'admin/system/configcollect/pseplayer'=>'播放器同義詞替換',
+    'admin/system/configcollect/psearea'=>'地區同義詞替換',
+    'admin/system/configcollect/pselang'=>'語言同義詞替換',
     'admin/system/configcollect/inrule'=>'入庫重復規則',
     'admin/system/configcollect/inrule_tip_role'=>'豆瓣ID和視頻名稱傳入按豆瓣ID優先',
     'admin/system/configcollect/inrule_tip_comment'=>'關聯數據名稱或豆瓣ID傳入按豆瓣ID優先（豆瓣ID僅在視頻模塊起作用）',
@@ -1030,6 +1032,8 @@ https://www.baidu.com/123.jpg
     'admin/system/configcollect/vod_namewords'=>'視頻名稱同義庫',
     'admin/system/configcollect/vod_thesaurus'=>'視頻詳情同義詞庫',
     'admin/system/configcollect/vod_playerwords'=>'播放器同義詞庫',
+    'admin/system/configcollect/vod_areawords'=>'地區同義詞庫',
+    'admin/system/configcollect/vod_langwords'=>'語言同義詞庫',
     'admin/system/configcollect/vod_words'=>'視頻詳情隨機詞庫',
     'admin/system/configcollect/art_thesaurus'=>'文章詳情同義詞庫',
     'admin/system/configcollect/art_words'=>'文章詳情隨機詞庫',