[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-17005-gdf4f5b7 - Git

24 Aug 2011

The branch, master has been updated
       via  df4f5b7c96a0846a9a98241a5e7d567917d8db0b (commit)
      from  f42b1d14dca8d982ed2305f28a2b6818fea8cadd (commit)
- Log -----------------------------------------------------------------
commit df4f5b7c96a0846a9a98241a5e7d567917d8db0b
Author: Piotr Przybylski piotrprz@gmail.com
Date:   Wed Aug 24 13:13:59 2011 +0200
Whitespace
-----------------------------------------------------------------------
Summary of changes:
 libraries/auth/swekey/swekey.auth.lib.php |   30 ++++++++++++++--------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php
index fae3531..db60e13 100644
--- a/libraries/auth/swekey/swekey.auth.lib.php
+++ b/libraries/auth/swekey/swekey.auth.lib.php
@@ -143,8 +143,8 @@ function Swekey_auth_error()
         return "Internal Error: CA File $caFile not found";
$result = null;
-	$swekey_id = $_GET['swekey_id'];
-	$swekey_otp = $_GET['swekey_otp'];
+    $swekey_id = $_GET['swekey_id'];
+    $swekey_otp = $_GET['swekey_otp'];
if (isset($swekey_id)) {
         unset($_SESSION['SWEKEY']['AUTHENTICATED_SWEKEY']);
@@ -186,19 +186,19 @@ function Swekey_auth_error()
     if (! isset($swekey_id)) {
         ?>
         <script>
-	if (key.length != 32)
-	{
-	    window.location.search="?swekey_id=" + key + "&token=<?php echo $_SESSION[' PMA_token ']; ?>";
-	}
-	else
-	{
-	    var url = "" + window.location;
-	    if (url.indexOf("?") > 0)
-	        url = url.substr(0, url.indexOf("?"));
-	    Swekey_SetUnplugUrl(key, "pma_login", url + "?session_to_unset=<?php echo session_id();?>&token=<?php echo $_SESSION[' PMA_token ']; ?>");
-	    var otp = Swekey_GetOtp(key, <?php echo '"'.$_SESSION['SWEKEY']['RND_TOKEN'].'"';?>);
-	    window.location.search="?swekey_id=" + key + "&swekey_otp=" + otp + "&token=<?php echo $_SESSION[' PMA_token ']; ?>";
-	}
+    if (key.length != 32)
+    {
+        window.location.search="?swekey_id=" + key + "&token=<?php echo $_SESSION[' PMA_token ']; ?>";
+    }
+    else
+    {
+        var url = "" + window.location;
+        if (url.indexOf("?") > 0)
+            url = url.substr(0, url.indexOf("?"));
+        Swekey_SetUnplugUrl(key, "pma_login", url + "?session_to_unset=<?php echo session_id();?>&token=<?php echo $_SESSION[' PMA_token ']; ?>");
+        var otp = Swekey_GetOtp(key, <?php echo '"'.$_SESSION['SWEKEY']['RND_TOKEN'].'"';?>);
+        window.location.search="?swekey_id=" + key + "&swekey_otp=" + otp + "&token=<?php echo $_SESSION[' PMA_token ']; ?>";
+    }
         </script>
         <?php
         return __('Authenticating...');
hooks/post-receive
-- 
phpMyAdmin


    