Simplified proxy configuration

Author: ejb

Readme.md

@@ -102,10 +102,14 @@ Then in `schema.json`, specify the function's name in the *pattern* field of you
 
 ## Running behind a proxy
 
-Add a file called *proxy.php* to the config directory with a function called `file_get_contents_with_proxy`. This function should accept a URL as an argument, and return the HTML of the specified URL.
+Add a file called *proxy.php* to the config directory. Within the file, use [`stream_context_set_default`](http://php.net/manual/en/function.stream-context-set-default.php) to configure the proxy.
 
 ## Changelog
 
+### 2.0.0
+
+- Simplified proxy configuration
+
 ### 1.0.1
 
 - New content types: 'url' and 'strict-url'

api/scraper.php

@@ -10,7 +10,6 @@
     include '../config/proxy.php';
 }
 
-
 function checkUrl( $url ) {
 
     if ( file_exists('../config/custom.php') ) {
@@ -21,11 +20,7 @@ function checkUrl( $url ) {
         return false;
     }
 
-    if (function_exists('file_get_contents_with_proxy')) {    
-        $file = file_get_contents_with_proxy( $url );
-    } else {
-        $file = file_get_contents( $url );
-    }
+    $file = file_get_contents( $url );
 
     if (!$file) {
         return false;
@@ -105,15 +100,13 @@ function checkUrl( $url ) {
                $strict = true;
            }
            $item_url = $schema[$i]['contents'];
-           if (function_exists('file_get_contents_with_proxy')) {    
-               file_get_contents_with_proxy( $item_url );
-           } else {
+           if (!empty($item_url)) {
                file_get_contents( $item_url );
-           }
-           $headerStatus = checkHeaderStatus($http_response_header, $strict);
-           $schema[$i]['_requestHeader'] = $http_response_header;
-           if ( !is_null($http_response_header) && ($headerStatus === false) ) {
-               $schema[$i]['ok'] = false;
+               $headerStatus = checkHeaderStatus($http_response_header, $strict);
+               $schema[$i]['_requestHeader'] = $http_response_header;
+               if ( !is_null($http_response_header) && ($headerStatus === false) ) {
+                   $schema[$i]['ok'] = false;
+               }
            }
        }
 

config_examples/HOW TO CONFIGURE.md

@@ -12,4 +12,4 @@ Used to specify custom selectors and validators. See Readme for more info.
 
 ## proxy.php
 
-Add a file called *proxy.php* to the config directory with a function called `file_get_contents_with_proxy`. This function should accept a URL as an argument, and return the HTML of the specified URL.
+Add a file called *proxy.php* to the config directory. Within the file, use [`stream_context_set_default`](http://php.net/manual/en/function.stream-context-set-default.php) to configure the proxy.

config_examples/proxy.example.php

@@ -4,15 +4,13 @@
     This is an example of how one might use the meta checker with a proxy.
 */   
 
-if (file_exists('../my/internal/proxy.php')) {
-    include_once('../my/internal/proxy.php');
-    function file_get_contents_with_proxy($url) {
-        return myInternalProxy($url);
-    }
-} else {
-    function file_get_contents_with_proxy($url){
-        return file_get_contents($url);
-    }
-}
+stream_context_set_default(
+    array(
+        'http' => array(
+            'proxy' => "tcp://proxy.mycompany.net:80",
+            'request_fulluri' => true,
+        )
+    )
+);
 
 ?>

index.html

@@ -54,7 +54,7 @@ <h3>{{group}}</h3>
 
             </div>
 
-            <p class="footer"><a  target="_self" ng-href="./api/index.php?url={{currentUrl}}">API version of this check</a> | The Meta Tag Checker. v1.0.1 | <a href="https://github.com/dowjones/the-meta-tag-checker">View source on Github</a></p>
+            <p class="footer"><a  target="_self" ng-href="./api/index.php?url={{currentUrl}}">API version of this check</a> | The Meta Tag Checker. v2.0.0 | <a href="https://github.com/dowjones/the-meta-tag-checker">View source on Github</a></p>