Explorar o código

1,修复部分情况下自动获取tag失效的问题。
2,修复后台某些情况下删除文件的问题。
3,其他细节。

magicblack %!s(int64=5) %!d(string=hai) anos
pai
achega
3296ccf0cf

+ 1 - 1
application/common.php

@@ -909,7 +909,7 @@ function mac_rep_pse_syn($psearr,$txt)
 }
 
 function mac_get_tag($title,$content){
-    $url = base64_decode('aHR0cDovL2FwaS5tYWNjbXMuY29t').'/keyword/index/txt/'.rawurlencode($title).rawurlencode(mac_substring(strip_tags($content),200));
+    $url = base64_decode('aHR0cDovL2FwaS5tYWNjbXMuY29t').'/keyword/index?txt='.rawurlencode($title).rawurlencode(mac_substring(strip_tags($content),200));
     $data = mac_curl_get($url);
 	$json = @json_decode($data,true);
 	if($json){

+ 3 - 2
application/common/model/Actor.php

@@ -447,8 +447,9 @@ class Actor extends Base {
         }
         $path = './';
         foreach($list['list'] as $k=>$v){
-            if(file_exists($path.$v['actor_pic'])){
-                unlink($path.$v['actor_pic']);
+            $pic = $path.$v['actor_pic'];
+            if(file_exists($pic) && (substr($pic,0,8) == "./upload") || count( explode("./",$pic) ) ==1){
+                unlink($pic);
             }
             if($GLOBALS['config']['view']['actor_detail'] ==2 ){
                 $lnk = mac_url_actor_detail($v);

+ 9 - 6
application/common/model/Art.php

@@ -513,14 +513,17 @@ class Art extends Base {
         }
         $path = './';
         foreach($list['list'] as $k=>$v){
-            if(file_exists($path.$v['art_pic'])){
-                unlink($path.$v['art_pic']);
+            $pic = $path.$v['art_pic'];
+            if(file_exists($pic) && (substr($pic,0,8) == "./upload") || count( explode("./",$pic) ) ==1){
+                unlink($pic);
             }
-            if(file_exists($path.$v['art_pic_thumb'])){
-                unlink($path.$v['art_pic_thumb']);
+            $pic = $path.$v['art_pic_thumb'];
+            if(file_exists($pic) && (substr($pic,0,8) == "./upload") || count( explode("./",$pic) ) ==1){
+                unlink($pic);
             }
-            if(file_exists($path.$v['art_pic_slide'])){
-                unlink($path.$v['art_pic_slide']);
+            $pic = $path.$v['art_pic_slide'];
+            if(file_exists($pic) && (substr($pic,0,8) == "./upload") || count( explode("./",$pic) ) ==1){
+                unlink($pic);
             }
             if($GLOBALS['config']['view']['art_detail'] ==2 ){
                 $lnk = mac_url_art_detail($v);

+ 3 - 2
application/common/model/Role.php

@@ -373,8 +373,9 @@ class Role extends Base {
         $list = $this->where($where)->select();
         $path = './';
         foreach($list as $k=>$v){
-            if(file_exists($path.$v['role_pic'])){
-                unlink($path.$v['role_pic']);
+            $pic = $path.$v['role_pic'];
+            if(file_exists($pic) && (substr($pic,0,8) == "./upload") || count( explode("./",$pic) ) ==1){
+                unlink($pic);
             }
         }
         return ['code'=>1,'msg'=>'删除成功'];

+ 9 - 6
application/common/model/Topic.php

@@ -405,14 +405,17 @@ class Topic extends Base {
         }
         $path = './';
         foreach($list['list'] as $k=>$v){
-            if(file_exists($path.$v['topic_pic'])){
-                unlink($path.$v['topic_pic']);
+            $pic = $path.$v['topic_pic'];
+            if(file_exists($pic) && (substr($pic,0,8) == "./upload") || count( explode("./",$pic) ) ==1){
+                unlink($pic);
             }
-            if(file_exists($path.$v['topic_pic_thumb'])){
-                unlink($path.$v['topic_pic_thumb']);
+            $pic = $path.$v['topic_pic_thumb'];
+            if(file_exists($pic) && (substr($pic,0,8) == "./upload") || count( explode("./",$pic) ) ==1){
+                unlink($pic);
             }
-            if(file_exists($path.$v['topic_pic_slide'])){
-                unlink($path.$v['topic_pic_slide']);
+            $pic = $path.$v['topic_pic_slide'];
+            if(file_exists($pic) && (substr($pic,0,8) == "./upload") || count( explode("./",$pic) ) ==1){
+                unlink($pic);
             }
             if($GLOBALS['config']['view']['topic_detail'] ==2 ){
                 $lnk = mac_url_topic_detail($v);

+ 9 - 6
application/common/model/Vod.php

@@ -631,14 +631,17 @@ class Vod extends Base {
         }
         $path = './';
         foreach($list['list'] as $k=>$v){
-            if(file_exists($path.$v['vod_pic'])){
-                unlink($path.$v['vod_pic']);
+            $pic = $path.$v['vod_pic'];
+            if(file_exists($pic) && (substr($pic,0,8) == "./upload") || count( explode("./",$pic) ) ==1){
+                unlink($pic);
             }
-            if(file_exists($path.$v['vod_pic_thumb'])){
-                unlink($path.$v['vod_pic_thumb']);
+            $pic = $path.$v['vod_pic_thumb'];
+            if(file_exists($pic) && (substr($pic,0,8) == "./upload") || count( explode("./",$pic) ) ==1){
+                unlink($pic);
             }
-            if(file_exists($path.$v['vod_pic_slide'])){
-                unlink($path.$v['vod_pic_slide']);
+            $pic = $path.$v['vod_pic_slide'];
+            if(file_exists($pic) && (substr($pic,0,8) == "./upload") || count( explode("./",$pic) ) ==1){
+                unlink($pic);
             }
             if($GLOBALS['config']['view']['vod_detail'] ==2 ){
                 $lnk = mac_url_vod_detail($v);

+ 3 - 2
application/common/model/Website.php

@@ -504,8 +504,9 @@ class Website extends Base {
         }
         $path = './';
         foreach($list['list'] as $k=>$v){
-            if(file_exists($path.$v['website_pic'])){
-                unlink($path.$v['website_pic']);
+            $pic = $path.$v['website_pic'];
+            if(file_exists($pic) && (substr($pic,0,8) == "./upload") || count( explode("./",$pic) ) ==1){
+                unlink($pic);
             }
             if($GLOBALS['config']['view']['website_detail'] ==2 ){
                 $lnk = mac_url_website_detail($v);