From 5be10ad2137b30bfbd24e2af0faa41c0c6ed6f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Thu, 19 Oct 2017 15:22:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=9A=E5=AA=92=E4=BD=93=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8B=E5=9C=B0=E5=9D=80=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 media/popselectpicture.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/media/popselectpicture.php b/media/popselectpicture.php
index 872868ef..ef02d584 100644
--- a/media/popselectpicture.php
+++ b/media/popselectpicture.php
@@ -108,15 +108,9 @@ function is_remote_ip()
 		} else {
 			$rwidth = '';
 		}?>
-		<?php if (isset($_GET['remote'])){ ?>
-			<?php if(is_remote_ip()){ ?>
-				<iframe  id="test" frameborder="0" src="http://photo.chtcdn.com:3581/OutputApp/searchpicture.aspx?<?php echo($rwidth);?>webcode=<?php echo $media_site_code; ?>&lgc=<?php echo $_GET['site_lgc'];?>&apptype=translate&uname=ycc&upass=ycc&lmisn=1&WebUrl=<?php echo isset($_GET['WebUrl'])?$_GET['WebUrl']:false;?>&redirecturl=http://<?php echo $_SERVER['HTTP_HOST']; ?>/media/transitval.php" > </iframe>
-        	<?php }else { ?>
-		    	<iframe  id="test" frameborder="0" src="http://video.chtcdn.com/OutputApp/searchpicture.aspx?<?php echo($rwidth);?>webcode=<?php echo $media_site_code; ?>&lgc=<?php echo $_GET['site_lgc'];?>&apptype=translate&WebUrl=<?php echo isset($_GET['WebUrl'])?$_GET['WebUrl']:false;?>&redirecturl=http://<?php echo $_SERVER['HTTP_HOST']; ?>/media/transitval.php" > </iframe>
-        	<?php } ?>
-        <?php }else if(is_remote_ip()){ ?>
-			<iframe id="test" frameborder="0" src="http://photo.chtcdn.com:3581/OutputApp/searchpicture.aspx?<?php echo($rwidth);?>webcode=<?php echo $media_site_code; ?>&lgc=<?php echo $_GET['site_lgc'];?>&apptype=infomation&uname=ycc&upass=ycc&lmisn=1&WebUrl=<?php echo isset($_GET['WebUrl'])?$_GET['WebUrl']:false;?>&redirecturl=http://<?php echo $_SERVER['HTTP_HOST']; ?>/media/transitval.php" > </iframe>
-		<?php }else{ ?>
+		<?php if (isset($_GET['remote']) || is_remote_ip()){ ?>
+			<iframe  id="test" frameborder="0" src="http://photo.chtcdn.com:3581/OutputApp/searchpicture.aspx?<?php echo($rwidth);?>webcode=<?php echo $media_site_code; ?>&lgc=<?php echo $_GET['site_lgc'];?>&apptype=translate&uname=ycc&upass=ycc&lmisn=1&WebUrl=<?php echo isset($_GET['WebUrl'])?$_GET['WebUrl']:false;?>&redirecturl=http://<?php echo $_SERVER['HTTP_HOST']; ?>/media/transitval.php" > </iframe>
+			<?php }else{ ?>
 		   <iframe  id="test" frameborder="0" src="http://video.chtcdn.com/OutputApp/searchpicture.aspx?<?php echo($rwidth);?>webcode=<?php echo $media_site_code; ?>&lgc=<?php echo $_GET['site_lgc'];?>&apptype=infomation&WebUrl=<?php echo isset($_GET['WebUrl'])?$_GET['WebUrl']:false;?>&redirecturl=http://<?php echo $_SERVER['HTTP_HOST']; ?>/media/transitval.php" > </iframe>
 		<?php } ?>
 	</body>

From e50482ba370d893dcc7a6add092dce849e0df206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Thu, 19 Oct 2017 15:29:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=9A=E5=AA=92=E4=BD=93=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8B=E5=9C=B0=E5=9D=80=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 media/popselectpicture.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/media/popselectpicture.php b/media/popselectpicture.php
index ef02d584..617aad4b 100644
--- a/media/popselectpicture.php
+++ b/media/popselectpicture.php
@@ -91,11 +91,14 @@ function is_remote_ip()
 	//print_r($_SERVER);
 	echo '<!--'.$ip_list.'-->';
 	
-	if (stripos($ip_list,'202.103.68.34')!==false) {
-		return false;
-	}elseif (stripos($ip_list,'221.7.151.39')!==false || stripos($ip_list,'221.7.151.37')!==false || stripos($ip_list,'221.7.151.41')!==false || stripos($ip_list,'111.59.90.31')!==false || stripos($ip_list,'180.140.114.208')!==false ){
-		return false;
-	}else if($ip_list!=='::1'){ //这个也是本地IP
+	if (stripos($ip_list,'202.103.68.34')!==false
+	|| stripos($ip_list,'221.7.151.39')!==false 
+	|| stripos($ip_list,'221.7.151.37')!==false 
+	|| stripos($ip_list,'221.7.151.41')!==false 
+	|| stripos($ip_list,'111.59.90.31')!==false 
+	|| stripos($ip_list,'180.140.114.208')!==false
+	|| stripos($ip_list,'::1')!==false //这个也是本地IP
+	){ 
 		return false;
 	}
 	return true;

From 3492d3ccddadd6a942240182065cf9f551f88a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Thu, 19 Oct 2017 15:48:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B1=E4=BA=8ECDN?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=BC=95=E8=B5=B7=E7=9A=84=E5=A4=9A=E5=AA=92?=
 =?UTF-8?q?=E4=BD=93=E4=B8=AD=E5=BF=83=E8=B0=83=E7=94=A8=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 media/popselectpicture.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media/popselectpicture.php b/media/popselectpicture.php
index 617aad4b..3982f615 100644
--- a/media/popselectpicture.php
+++ b/media/popselectpicture.php
@@ -1,3 +1,4 @@
+<?php header('Cache-Control: no-cache'); ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head >