From cbbaa323a95c05b2662f361b19a58da84f5705da Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Fri, 7 Dec 2012 11:38:30 +0000
Subject: [PATCH] Proxy ajax calls to pma.net to avoid browser notices
 Conflicts: 	js/functions.js

---
 js/functions.js   | 40 +++++++++++++++++++++++-----------------
 version_check.php | 16 ++++++++++++++++
 2 files changed, 39 insertions(+), 17 deletions(-)
 create mode 100644 version_check.php

diff --git a/js/functions.js b/js/functions.js
index 9053e22c16..de881f8251 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -126,23 +126,29 @@ function parseVersionString (str)
  */
 function PMA_current_version(data)
 {
-    var current = parseVersionString(pmaversion);
-    var latest = parseVersionString(data['version']);
-    var version_information_message = PMA_messages['strLatestAvailable'] + ' ' + escapeHtml(data['version']);
-    if (latest > current) {
-        var message = $.sprintf(PMA_messages['strNewerVersion'], escapeHtml(data['version']), escapeHtml(data['date']));
-        if (Math.floor(latest / 10000) == Math.floor(current / 10000)) {
-            /* Security update */
-            klass = 'error';
-        } else {
-            klass = 'notice';
+    if (data && data.version && data.date) {
+        var current = parseVersionString(pmaversion);
+        var latest = parseVersionString(data['version']);
+        var version_information_message = PMA_messages['strLatestAvailable'] + ' ' + escapeHtml(data['version']);
+        if (latest > current) {
+            var message = $.sprintf(
+                PMA_messages['strNewerVersion'],
+                escapeHtml(data['version']),
+                escapeHtml(data['date'])
+            );
+            if (Math.floor(latest / 10000) === Math.floor(current / 10000)) {
+                /* Security update */
+                klass = 'error';
+            } else {
+                klass = 'notice';
+            }
+            $('#maincontainer').after('<div class="' + klass + '">' + message + '</div>');
         }
-        $('#maincontainer').after('<div class="' + klass + '">' + message + '</div>');
+        if (latest === current) {
+            version_information_message = ' (' + PMA_messages['strUpToDate'] + ')';
+        }
+        $('#li_pma_version').append(version_information_message);
     }
-    if (latest == current) {
-        version_information_message = ' (' + PMA_messages['strUpToDate'] + ')';
-    }
-    $('#li_pma_version').append(version_information_message);
 }
 
 /**
@@ -3096,8 +3102,8 @@ AJAX.registerOnload('functions.js', function() {
     /**
      * Load version information asynchronously.
      */
-    if ($('li.jsversioncheck').length > 0) {
-        $.getJSON('http://www.phpmyadmin.net/home_page/version.json', {}, PMA_current_version);
+    if ($('.jsversioncheck').length > 0) {
+        $.getJSON('version_check.php', {}, PMA_current_version);
     }
 
     if ($('#is_git_revision').length > 0) {
diff --git a/version_check.php b/version_check.php
new file mode 100644
index 0000000000..d893b9daaf
--- /dev/null
+++ b/version_check.php
@@ -0,0 +1,16 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Proxy for retrieving version information from phpmyadmin.net
+ *
+ * @package PhpMyAdmin
+ */
+
+$file = 'http://www.phpmyadmin.net/home_page/version.json';
+if (ini_get('allow_url_fopen')) {
+    echo file_get_contents($file);
+} else if (function_exists('curl_init')) {
+    curl_exec(curl_init($file));
+}
+
+?>