Cleanup some of the authentication code. Fix the problem where you must

navigate away from the initial page twice to get somewhere. Remove some
of the cruft that was no longer used. Don't unconditionally redirect a
user to their homepage if another url was specified pre-login. This will
allow admins to create bookmarks to specific pfsense webui pages.

1 files changed, 0 insertions, 28 deletions

diff --git a/usr/local/www/headjs.php b/usr/local/www/headjs.php
index 59af195..2042429 100644
--- a/usr/local/www/headjs.php
+++ b/usr/local/www/headjs.php
@@ -80,34 +80,6 @@ function getHeadJS() {
         $('cancelbutton').style.visibility = 'hidden';
       $('loading').style.visibility = 'visible';
       // submit the form using Ajax
-  ";
-  
-  
-  isset($HTTP_SERVER_VARS['AUTH_USER']) ? $scriptName = split("/", $_SERVER["SCRIPT_FILENAME"]) : $scriptName = split("/", "/index.php");
-  isset($HTTP_SERVER_VARS['AUTH_USER']) ? $loggedin = "var isLoggedIn = true;" : $loggedin = "var isLoggedIn = false;";
-  $scriptElms = count($scriptName);
-  $scriptName = $scriptName[$scriptElms-1];
-  $realScriptName = str_replace("/", "", $_SERVER["SCRIPT_NAME"]);
-  
-  $headjs .= "
-       {$loggedin}
-
-      if (! isLoggedIn) {
-        var newInput = document.createElement('input');
-        newInput.setAttribute('id', 'scriptname');
-        newInput.setAttribute('name', 'scriptname');
-        newInput.setAttribute('value', '{$realScriptName}');
-        newInput.setAttribute('type', 'hidden');
-
-        $('iform').appendChild(newInput);
-      }
-
-      new Ajax.Request('{$scriptName}', {
-                method     : 'post',
-                parameters : Form.serialize($('iform')),
-                onSuccess  : formSubmitted,
-                onFailure  : formFailure
-      });
     }
    
     function formSubmitted(resp) {