[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12167-g8824da9

[Piotr Przybylski]

The branch, master has been updated
       via  8824da9ed86eb1f50bb6a972e6c00779b7dda017 (commit)
      from  9b01642c9531be45d6ff96331901f941e3ed3638 (commit)


- Log -----------------------------------------------------------------
commit 8824da9ed86eb1f50bb6a972e6c00779b7dda017
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Sun Jul 31 17:23:34 2011 +0200

    Fix links in messages shown by setup script

-----------------------------------------------------------------------

Summary of changes:
 libraries/sanitizing.lib.php |    1 +
 setup/frames/index.inc.php   |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index 6d9c4bf..69885c7 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -21,6 +21,7 @@ function PMA_checkLink($url)
     );
     if (defined('PMA_SETUP')) {
         $valid_starts[] = '../Documentation.html';
+        $valid_starts[] = '?page=form&';
     } else {
         $valid_starts[] = './Documentation.html';
     }
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 83c6684..6b170f0 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -57,9 +57,10 @@ if (!$is_https) {
     $text = __('You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!');
 
     if (!empty($_SERVER['REQUEST_URI']) && !empty($_SERVER['HTTP_HOST'])) {
+        $link = 'https://' . htmlspecialchars($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
         $strInsecureConnectionMsg2 = __('If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.');
-        $text .= ' ' . PMA_lang($strInsecureConnectionMsg2,
-            'https://' . htmlspecialchars($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']));
+        $strInsecureConnectionMsg2 = sprintf($strInsecureConnectionMsg2, $link);
+        $text .= ' ' . PMA_lang($strInsecureConnectionMsg2);
     }
     messages_set('notice', 'no_https', __('Insecure connection'), $text);
 }


hooks/post-receive
-- 
phpMyAdmin