Changeset 35280 for branches/eam_branches/ipp-20130307/dvodist/www-util/ippdata.page.mkd

Timestamp:

Mar 8, 2013, 2:34:44 PM (13 years ago)

Author:

eugene

Message:

updates to the ippdata pages

File:

• branches/eam_branches/ipp-20130307/dvodist/www-util/ippdata.page.mkd (modified) (2 diffs)

branches/eam_branches/ipp-20130307/dvodist/www-util/ippdata.page.mkd

@@ -7 +7 @@
 // if we come in directly, the top-level directory should be /dvodist
 // if we come in from the ippops1 proxy, we need to set the root to /
-$ifaProxy = "128.171.227.208";
+$realHost = "ipp.ifa.hawaii.edu";
 
-// is the request coming from our proxY?
-$fromProxy = $_SERVER['HTTP_X_FORWARDED_FOR'] && ($_SERVER['REMOTE_ADDR'] == $ifaProxy);
-if ($fromProxy) {
+// is the request coming from our proxy?
+if ($_SERVER['SERVER_NAME'] == $realHost) {
   $rootdir = "@ROOTWWW@";
- } else {
+} else {
   $rootdir = "@ROOTWWW@@ROOTDIR@";
- }
+}
 
 menu("$utils/ippdata.menu.dat", 'Pan-STARRS 1 Data Distribution Server', $rootdir, "$rootdir/ipp.css", '', '');
@@ -24 +23 @@
 menu_end();
 ?>
-
-// generic proxy detection
-// if ( $_SERVER['HTTP_X_FORWARDED_FOR']
-//      || $_SERVER['HTTP_X_FORWARDED']
-//      || $_SERVER['HTTP_FORWARDED_FOR']
-//      || $_SERVER['HTTP_CLIENT_IP']
-//      || $_SERVER['HTTP_VIA']
-//      || in_array($_SERVER['REMOTE_PORT'], array(8080,80,6588,8000,3128,553,554))
-//      || @fsockopen($_SERVER['REMOTE_ADDR'], 80, $errno, $errstr, 30))
-//   {
-//     exit('Proxy detected');
-//   }
-
-// list server info:
-// $varlist = array ('SCRIPT_NAME', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_FORWARDED_FOR', 'HTTP_CLIENT_IP', 'HTTP_VIA', 'REMOTE_ADDR');
-// 
-// foreach ($varlist as $name) {
-//   echo "$name : $_SERVER[$name]<br>\n";
-// }
-// 
-// echo "get list<br>\n";
-// foreach ($_GET as $key => $value) {
-//   echo "$key : $value<br>\n";
-// }
-