changed piwik-proxy.php file to latest one from https://github.com/piwik/tracker-proxy/blob/master/piwik.php

changed searched variable name back to $PIWIK_URL to avoid modifying proxy file variable names.

Author: kevinb456

upload/admin/controller/module/piwik.php

@@ -16,7 +16,7 @@ public function index() {
 			$path_to_file = implode("/",explode("/", DIR_APPLICATION, -2)) . "/piwik-proxy.php";
 			if (file_exists($path_to_file)) {
 				$file_contents = file_get_contents($path_to_file);
-				$file_contents = preg_replace('/\$ANALYTICS_URL = \'.{1,512}?\';/', '$ANALYTICS_URL = \'http://' . $this->request->post['piwik_analytics_url'] . '\';', $file_contents, 1);
+				$file_contents = preg_replace('/\$PIWIK_URL = \'.{1,512}?\';/', '$PIWIK_URL = \'http://' . $this->request->post['piwik_analytics_url'] . '\';', $file_contents, 1);
 				$file_contents = preg_replace('/\$TOKEN_AUTH = \'[a-z0-9]{1,32}\';/', '$TOKEN_AUTH = \'' . $this->request->post['piwik_token_auth'] . '\';', $file_contents, 1);
 				file_put_contents($path_to_file,$file_contents);
 			}

upload/piwik-proxy.php

@@ -1,12 +1,16 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  * Piwik Proxy Hide URL
  *
  * @link http://piwik.org/faq/how-to/#faq_132
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+if (file_exists('config.php')) {
+    include 'config.php';
+}
+
 // -----
 // Important: read the instructions in README.md or at:
 // https://github.com/piwik/piwik/tree/master/misc/proxy-hide-piwik-url#piwik-proxy-hide-url
@@ -15,15 +19,33 @@
 // Edit the line below, and replace http://your-piwik-domain.example.org/piwik/
 // with your Piwik URL ending with a slash.
 // This URL will never be revealed to visitors or search engines.
-$ANALYTICS_URL = 'http://your-piwik-domain.example.org/piwik/';
+if (! isset($PIWIK_URL)) {
+    $PIWIK_URL = 'http://your-piwik-domain.example.org/piwik/';
+}
 
 // Edit the line below, and replace xyz by the token_auth for the user "UserTrackingAPI"
 // which you created when you followed instructions above.
-$TOKEN_AUTH = 'xyz';
+if (! isset($TOKEN_AUTH)) {
+    $TOKEN_AUTH = 'xyz';
+}
 
 // Maximum time, in seconds, to wait for the Piwik server to return the 1*1 GIF
-$timeout = 5;
+if (! isset($timeout)) {
+    $timeout = 5;
+}
+
+function sendHeader($header, $replace = true)
+{
+    headers_sent() || header($header, $replace);
+}
 
+function arrayValue($array, $key, $value = null)
+{
+    if (!empty($array[$key])) {
+        $value = $array[$key];
+    }
+    return $value;
+}
 
 // DO NOT MODIFY BELOW
 // ---------------------------
@@ -34,40 +56,79 @@
         $modifiedSince = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
         // strip any trailing data appended to header
         if (false !== ($semicolon = strpos($modifiedSince, ';'))) {
-            $modifiedSince = strtotime(substr($modifiedSince, 0, $semicolon));
+            $modifiedSince = substr($modifiedSince, 0, $semicolon);
         }
+        $modifiedSince = strtotime($modifiedSince);
     }
     // Re-download the piwik.js once a day maximum
     $lastModified = time() - 86400;
 
     // set HTTP response headers
-    header('Vary: Accept-Encoding');
+    sendHeader('Vary: Accept-Encoding');
 
     // Returns 304 if not modified since
-    if (!empty($modifiedSince) && $modifiedSince < $lastModified) {
-        header(sprintf("%s 304 Not Modified", $_SERVER['SERVER_PROTOCOL']));
+    if (!empty($modifiedSince) && $modifiedSince > $lastModified) {
+        sendHeader(sprintf("%s 304 Not Modified", $_SERVER['SERVER_PROTOCOL']));
     } else {
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-        @header('Content-Type: application/javascript; charset=UTF-8');
-        if ($piwikJs = file_get_contents($ANALYTICS_URL . 'piwik.js')) {
+        sendHeader('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        sendHeader('Content-Type: application/javascript; charset=UTF-8');
+        if ($piwikJs = file_get_contents($PIWIK_URL . 'piwik.js')) {
             echo $piwikJs;
         } else {
-            header($_SERVER['SERVER_PROTOCOL'] . '505 Internal server error');
+            sendHeader($_SERVER['SERVER_PROTOCOL'] . '505 Internal server error');
         }
     }
     exit;
 }
 
+@ini_set('magic_quotes_runtime', 0);
+
 // 2) PIWIK.PHP PROXY: GET parameters found, this is a tracking request, we redirect it to Piwik
-$url = sprintf("%spiwik.php?cip=%s&token_auth=%s&", $ANALYTICS_URL, @$_SERVER['REMOTE_ADDR'], $TOKEN_AUTH);
+$url = sprintf("%spiwik.php?cip=%s&token_auth=%s&", $PIWIK_URL, getVisitIp(), $TOKEN_AUTH);
+
 foreach ($_GET as $key => $value) {
-    $url .= $key . '=' . urlencode($value) . '&';
+    $url .= urlencode($key ). '=' . urlencode($value) . '&';
 }
-header("Content-Type: image/gif");
+sendHeader("Content-Type: image/gif");
 $stream_options = array('http' => array(
-    'user_agent' => @$_SERVER['HTTP_USER_AGENT'],
-    'header'     => sprintf("Accept-Language: %s\r\n", @str_replace(array("\n", "\t", "\r"), "", $_SERVER['HTTP_ACCEPT_LANGUAGE'])),
+    'user_agent' => arrayValue($_SERVER, 'HTTP_USER_AGENT', ''),
+    'header'     => sprintf("Accept-Language: %s\r\n", str_replace(array("\n", "\t", "\r"), "", arrayValue($_SERVER, 'HTTP_ACCEPT_LANGUAGE', ''))),
     'timeout'    => $timeout
 ));
 $ctx = stream_context_create($stream_options);
-echo file_get_contents($url, 0, $ctx);
+
+if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+
+    // PHP 5.2 breaks with the new 204 status code so we force returning the image every time
+    echo file_get_contents($url . '&send_image=1', 0, $ctx);
+
+} else {
+
+    // PHP 5.3 and above
+    $content = file_get_contents($url, 0, $ctx);
+
+    // Forward the HTTP response code
+    if (!headers_sent() && isset($http_response_header[0])) {
+        header($http_response_header[0]);
+    }
+
+    echo $content;
+
+}
+
+function getVisitIp()
+{
+    $matchIp = '/^([0-9]{1,3}\.){3}[0-9]{1,3}$/';
+    $ipKeys = array(
+        'HTTP_X_FORWARDED_FOR',
+        'HTTP_CLIENT_IP',
+        'HTTP_CF_CONNECTING_IP',
+    );
+    foreach($ipKeys as $ipKey) {
+        if (isset($_SERVER[$ipKey])
+            && preg_match($matchIp, $_SERVER[$ipKey])) {
+            return $_SERVER[$ipKey];
+        }
+    }
+    return arrayValue($_SERVER, 'REMOTE_ADDR');
+}