1，修复部分语言包显示问题。

2，修复同步图片显示链接的问题。
3，其他细节。

application/admin/controller/Images.php

@@ -246,7 +246,7 @@ class Images extends Base
 
                     $img_url = model('Image')->down_load($img_old, $config, $param['tab']);
                     $des = '';
-                    if(in_array($config['mode'],['local'])){
+                    if(in_array($config['mode'],['local']) || substr($img_url,0,7)=='upload/'){
                         $img_url = MAC_PATH . $img_url;
                         $link = $img_url;
                     }
@@ -279,16 +279,15 @@ class Images extends Base
 
                 $img_url = model('Image')->down_load($img_old, $config, $param['tab']);
                 $des = '';
-                
-                if(in_array($config['mode'],['local'])){
-
+                if(in_array($config['mode'],['local']) || substr($img_url,0,7)=='upload/'){
+                    $link = MAC_PATH . $img_url;
                 }
                 else{
                     $link = str_replace('mac:', $config['protocol'].':', $img_url);
                 }
 
                 if ($img_url == $img_old) {
-                    $des = '<a href="' . $link . '" target="_blank">' . $link . '</a><font color=red>'.lang('download_err').'!</font>';
+                    $des = '<a href="' . $img_old . '" target="_blank">' . $img_old . '</a><font color=red>'.lang('download_err').'!</font>';
                     $img_url .= $flag;
                 } else {
                     $des = '<a href="' . $link . '" target="_blank">' . $link . '</a><font color=green>'.lang('download_ok').'!</font>';

application/admin/view/actor/info.html

@@ -2,7 +2,7 @@
 <script type="text/javascript" src="__STATIC__/js/jquery.jscolor.js"></script>
 {include file="../../../application/admin/view/public/editor" flag="actor_editor"/}
 <div class="page-container p10">
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
     
     <form class="layui-form layui-form-pane" method="post" action="">
         <input type="hidden" name="actor_id" value="{$info.actor_id}">

application/admin/view/addon/config.html

@@ -1,6 +1,6 @@
 {include file="../../../application/admin/view/public/head" /}
 <div class="page-container p10">
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
 
     <form class="layui-form layui-form-pane" method="post" action="">
         <input id="admin_id" name="name" type="hidden" value="{$info.name}">

application/admin/view/art/info.html

@@ -3,7 +3,7 @@
 {include file="../../../application/admin/view/public/editor" flag="art_editor"/}
 
 <div class="page-container p10">
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
     
     <form class="layui-form layui-form-pane" method="post" action="">
         <input type="hidden" name="art_id" value="{$info.art_id}">

application/admin/view/domain/index.html

@@ -1,6 +1,6 @@
 {include file="../../../application/admin/view/public/head" /}
 <div class="page-container p10">
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
     
     <form class="layui-form layui-form-pane" method="post" action="">
         <input type="hidden" name="vod_id" value="{$info.vod_id}">

application/admin/view/role/info.html

@@ -2,7 +2,7 @@
 <script type="text/javascript" src="__STATIC__/js/jquery.jscolor.js"></script>
 {include file="../../../application/admin/view/public/editor" flag="role_editor"/}
 <div class="page-container p10">
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
     
     <form class="layui-form layui-form-pane" method="post" action="">
         <input type="hidden" name="role_id" value="{$info.role_id}">

application/admin/view/system/config.html

@@ -2,7 +2,7 @@
 
 <div class="page-container">
 
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
 
     <form class="layui-form layui-form-pane" action="">
         <input type="hidden" name="__token__" value="{$Request.token}" />

application/admin/view/system/configcomment.html

@@ -2,7 +2,7 @@
 
 <div class="page-container">
 
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
 
     <form class="layui-form layui-form-pane" action="">
         <input type="hidden" name="__token__" value="{$Request.token}" />

application/admin/view/system/configupload.html

@@ -2,7 +2,7 @@
 
 <div class="page-container">
 
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
 
     <form class="layui-form layui-form-pane" action="">
         <input type="hidden" name="__token__" value="{$Request.token}" />

application/admin/view/system/configuser.html

@@ -2,7 +2,7 @@
 
 <div class="page-container">
 
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
 
     <form class="layui-form layui-form-pane" action="">
         <input type="hidden" name="__token__" value="{$Request.token}" />

application/admin/view/topic/info.html

@@ -3,7 +3,7 @@
 {include file="../../../application/admin/view/public/editor" flag="topic_editor"/}
 <div class="page-container p10">
 
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
 
     <form class="layui-form layui-form-pane" method="post" action="">
         <input type="hidden" name="topic_id" value="{$info.topic_id}">

application/admin/view/type/info.html

@@ -1,7 +1,7 @@
 {include file="../../../application/admin/view/public/head" /}
 <div class="page-container p10">
 
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
     
     <form class="layui-form layui-form-pane" method="post" action="">
         <input type="hidden" name="type_id" value="{$info.type_id}">

application/admin/view/user/info.html

@@ -1,6 +1,6 @@
 {include file="../../../application/admin/view/public/head" /}
 <div class="page-container p10">
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
 
     <form class="layui-form layui-form-pane" method="post" action="">
         <input id="user_id" name="user_id" type="hidden" value="{$info.user_id}">
@@ -27,7 +27,7 @@
 
 
         <div class="layui-form-item ">
-            <label class="layui-form-label">{:lang('groupo')}：</label>
+            <label class="layui-form-label">{:lang('group')}：</label>
             <div class="layui-input-inline">
                 <select name="group_id" lay-filter="group_id">
                     {volist name="group_list" id="vo"}

application/admin/view/vod/info.html

@@ -2,7 +2,7 @@
 <script type="text/javascript" src="__STATIC__/js/jquery.jscolor.js"></script>
 {include file="../../../application/admin/view/public/editor" flag="vod_editor"/}
 <div class="page-container p10">
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
     
     <form class="layui-form layui-form-pane" method="post" action="">
         <input type="hidden" name="vod_id" value="{$info.vod_id}">

application/admin/view/vod/iplot.html

@@ -2,7 +2,7 @@
 <script type="text/javascript" src="__STATIC__/js/jquery.jscolor.js"></script>
 {include file="../../../application/admin/view/public/editor" flag="vod_editor"/}
 <div class="page-container p10">
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
     
     <form class="layui-form layui-form-pane" method="post" action="">
         <input type="hidden" name="vod_id" value="{$info.vod_id}">

application/admin/view/website/info.html

@@ -3,7 +3,7 @@
 {include file="../../../application/admin/view/public/editor" flag="website_editor"/}
 
 <div class="page-container p10">
-    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160"></div>
+    <div class="showpic" style="display:none;"><img class="showpic_img" width="120" height="160" referrerPolicy="no-referrer"></div>
     
     <form class="layui-form layui-form-pane" method="post" action="">
         <input type="hidden" name="website_id" value="{$info.website_id}">

application/common/model/Collect.php

@@ -378,8 +378,12 @@ class Collect extends Base {
     {
         if($pic_status == 1){
             $img_url = model('Image')->down_load($pic_url, $GLOBALS['config']['upload'], $flag);
-            $link = MAC_PATH . $img_url;
-            $link = str_replace('mac:', $GLOBALS['config']['upload']['protocol'].':', $link);
+            if(substr($img_url,0,7)=='upload/'){
+                $link = MAC_PATH . $img_url;
+            }
+            else{
+                $link = str_replace('mac:', $GLOBALS['config']['upload']['protocol'].':', $img_url);
+            }
             if ($img_url == $pic_url) {
                 $des = '<a href="' . $pic_url . '" target="_blank">' . $pic_url . '</a><font color=red>'.lang('download_err').'!</font>';
             } else {

application/extra/version.php

@@ -3,7 +3,7 @@ return array (
     'name' => '苹果CMS内容管理系统',
     'copyright' => 'MacCMS',
     'url' => '//github.com/magicblack',
-    'code' => '2020.1000.1055',
+    'code' => '2020.1000.1056',
     'license' => '免费版',
 );
 ?>

application/lang/zh-cn.php

@@ -107,7 +107,8 @@ return [
     'audit_time'=>'审核时间',
     'bank'=>'银行',
     'request_err'=>'请求失败',
-
+    'group'=>'会员组',
+    'access'=>'账号',
     'test_ok'=>'测试成功',
     'test_err'=>'测试失败',
     'browser_jump'=>'如果您的浏览器没有自动跳转，请点击这里',
@@ -120,7 +121,7 @@ return [
     'verify_empty'=>'请输入验证码',
     'verify_err'=>'验证码错误',
     'url_empty'=>'请输入URL',
-
+    'cancel_level'=>'取消推荐',
     'select'=>'选择',
     'select_return'=>'选择返回',
     'select_data'=>'选择数据',

application/lang/zh-tw.php

@@ -107,7 +107,8 @@ return [
     'audit_time'=>'審核時間',
     'bank'=>'銀行',
     'request_err'=>'請求失敗',
-
+    'group'=>'會員組',
+    'access'=>'賬號',
     'test_ok'=>'測試成功',
     'test_err'=>'測試失敗',
     'browser_jump'=>'如果您的瀏覽器沒有自動跳轉，請點擊這裏',
@@ -120,7 +121,7 @@ return [
     'verify_empty'=>'請輸入驗證碼',
     'verify_err'=>'驗證碼錯誤',
     'url_empty'=>'請輸入URL',
-
+    'cancel_level'=>'取消推薦',
     'select'=>'選擇',
     'select_return'=>'選擇返回',
     'select_data'=>'選擇數據',