Changeset 17681

Timestamp:

04/22/14 23:31:05 (11 years ago)

Author:

tbretz

Message:

Some updated to the authentication code to make the result more logical; a minor update to handling interrupts

File:

• trunk/FACT++/www/smartfact/index.php (modified) (3 diffs)

trunk/FACT++/www/smartfact/index.php

@@ -18 +18 @@
     $username = $_SERVER['PHP_AUTH_USER'];
     $password = $_SERVER['PHP_AUTH_PW'];
+
+    if (!isset($username) || !isset($password))
+        return "Unauthorized";
 
     $con = @ldap_connect($ldaphost);
@@ -201 +204 @@
 // --------------------------------------------------------------------
 
-if (!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW']))
-{
-    header('WWW-Authenticate: Basic realm="SmartFACT++"');
-    header('HTTP/1.0 401 Unauthorized');
-    return;
-}
-
 $rc = login();
 if ($rc!="")
-    return header('HTTP/1.0 401 '.$rc);
+{
+    header('WWW-Authenticate: Basic realm="SmartFACT++"');
+    header('HTTP/1.0 401 '.$rc);
+    return;
+}
 
 // --------------------------------------------------------------------
@@ -285 +285 @@
 if (isset($_GET['interrupt']))
 {
+    $irq = $_GET['interrupt'];
     unset($_GET['interrupt']);
-
-    $irq = "";
-    if (isset($_GET['irq']))
-    {
-        $irq = $_GET['irq'];
-        unset($_GET['irq']);
-    }
 
     $args = "";