added check for getActionFromPage failing (and reformatted)

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@928 c91229c3-7414-0410-bfa2-8a42b809f60b

added check for getActionFromPage failing (and reformatted)
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@928 c91229c3-7414-0410-bfa2-8a42b809f60b
Michael Joseph
1 parent 838caef8
Showing 1 changed file with 72 additions and 65 deletions
presentation/login.php
@@ -24,32 +24,33 @@ global $default;
 if ($loginAction == "loginForm") {
     // TODO: build login form using PatternMainPage
     print "<html>
-           <head>
-           <link rel=\"stylesheet\" href=\"$default->owl_ui_url/stylesheet.php\">
-           </head>
-           <body>
-           <center>
-           <img src=\"$default->owl_root_url/locale/$default->owl_lang/graphics/$default->logo\">
-           <br><br>
-           <table>\n
-           <form action=\"login.php\" method=\"post\">
-           <tr><td>Please enter your details below to login</td></tr>
-           <tr><td></td></tr>
-           <tr align=\"center\"><td><font color=\"red\">$errorMessage</font><tr><td>
-           \t<tr><td>$lang_username:</td></tr>
-           \t<tr><td><input type=\"text\" name=\"fUserName\" size=\"35\"></td></tr>
-           \t<tr><td>$lang_password:</td></tr>
-           <tr><td><input type=\"password\" name=\"fPassword\" size=\"35\">
-           </td></tr>
-           <input type=\"hidden\" name=\"redirect\" value=\"$redirect\"/>
-           <input type=\"hidden\" name=\"loginAction\" value=\"login\">\n    
-           <tr align=\"right\"><td><input type=\"image\" src=\"$default->owl_graphics_url/icons/login.jpg\" border=\"0\"></td></tr>\n
-           </table>
-           </center>
-           </body>
-           </html>";
-    
-} elseif ($loginAction == "login") {
+    <head>
+    <link rel=\"stylesheet\" href=\"$default->owl_ui_url/stylesheet.php\">
+    </head>
+    <body>
+    <center>
+    <img src=\"$default->owl_root_url/locale/$default->owl_lang/graphics/$default->logo\">
+    <br><br>
+    <table>\n
+    <form action=\"login.php\" method=\"post\">
+    <tr><td>Please enter your details below to login</td></tr>
+    <tr><td></td></tr>
+    <tr align=\"center\"><td><font color=\"red\">$errorMessage</font><tr><td>
+    \t<tr><td>$lang_username:</td></tr>
+    \t<tr><td><input type=\"text\" name=\"fUserName\" size=\"35\"></td></tr>
+    \t<tr><td>$lang_password:</td></tr>
+    <tr><td><input type=\"password\" name=\"fPassword\" size=\"35\">
+    </td></tr>
+    <input type=\"hidden\" name=\"redirect\" value=\"$redirect\"/>
+    <input type=\"hidden\" name=\"loginAction\" value=\"login\">\n
+    <tr align=\"right\"><td><input type=\"image\" src=\"$default->owl_graphics_url/icons/login.jpg\" border=\"0\"></td></tr>\n
+    </table>
+    </center>
+    </body>
+    </html>";
+
+}
+elseif ($loginAction == "login") {
     // set default url for login failure
     $url = $url . "login.php?loginAction=loginForm";
     // if requirements are met and we have a username and password to authenticate
@@ -60,51 +61,57 @@ if ($loginAction == &quot;loginForm&quot;) {
         switch ($userDetails["status"]) {
             // bad credentials
-            case 0:
+        case 0:
                 $url = $url . "&errorMessage=$lang_loginfail";
-                break;
+            break;
             // successfully authenticated
-            case 1:
-                // start the session
-                $session = new Session();
-                $sessionID = $session->create($userDetails["userID"]);
-                
-                // initialise page-level authorisation array
-                $_SESSION["pageAccess"] = NULL;
-                
-                // check for a location to forward to
-                if (isset($redirect) && strlen(trim($redirect))>0) {
-                    // remove any params from redirect before looking up from sitemap
-                    if (strstr($redirect, "?")) {
-                        $queryString = substr($redirect, strpos($redirect, "?")+1, strlen($redirect));
-                        $redirect = substr($redirect, 0, strpos($redirect, "?"));
-                        $default->log->debug("login.php redirect=$redirect; querystring=$queryString");
-                    }
-                    
-                    // need to strip owl_root_url off $redirect
-                    if (strlen($default->owl_root_url) > 0) {
-                        $tmp = urldecode($redirect);
-                        $default->log->debug("login.php: substr($tmp, strpos($tmp, $default->owl_root_url)+strlen($default->owl_root_url), strlen($tmp))");
-                        $redirect = substr($tmp, strpos($tmp, $default->owl_root_url)+strlen($default->owl_root_url), strlen($tmp));
-                        $default->log->debug("login.php: redirect=$redirect");                        
-                    }                    
+        case 1:
+            // start the session
+            $session = new Session();
+            $sessionID = $session->create($userDetails["userID"]);
-                    $url = generateControllerUrl($default->siteMap->getActionFromPage($redirect));
-                // else redirect to the dashboard
-                } else {                                            
+            // initialise page-level authorisation array
+            $_SESSION["pageAccess"] = NULL;
+
+            // check for a location to forward to
+            if (isset($redirect) && strlen(trim($redirect))>0) {
+                // remove any params from redirect before looking up from sitemap
+                if (strstr($redirect, "?")) {
+                    $queryString = substr($redirect, strpos($redirect, "?")+1, strlen($redirect));
+                    $redirect = substr($redirect, 0, strpos($redirect, "?"));
+                    $default->log->debug("login.php redirect=$redirect; querystring=$queryString");
+                }
+
+                // need to strip owl_root_url off $redirect
+                if (strlen($default->owl_root_url) > 0) {
+                    $tmp = urldecode($redirect);
+                    $default->log->debug("login.php: substr($tmp, strpos($tmp, $default->owl_root_url)+strlen($default->owl_root_url), strlen($tmp))");
+                    $redirect = substr($tmp, strpos($tmp, $default->owl_root_url)+strlen($default->owl_root_url), strlen($tmp));
+                    $default->log->debug("login.php: redirect=$redirect");
+                }
+                $action = $default->siteMap->getActionFromPage($redirect);
+                if ($action) {
+                    $url = generateControllerUrl($action);
+                } else {
+                    // default to the dashboard
                     $url = generateControllerUrl("dashboard");
                 }
-                break;
-            // login disabled                    
-            case 2:
-                $url = $url . "&errorMessage=$lang_logindisabled";
-                break;
+
+            // else redirect to the dashboard if there is none
+            } else {
+                $url = generateControllerUrl("dashboard");
+            }
+            break;
+            // login disabled
+        case 2:
+            $url = $url . "&errorMessage=$lang_logindisabled";
+            break;
             // too many sessions
-            case 3 :
-                $url = $url . "&errorMessage=$lang_toomanysessions";
-                break;
-            default :
-                $url = $url . "&errorMessage=$lang_err_general";
+        case 3 :
+            $url = $url . "&errorMessage=$lang_toomanysessions";
+            break;
+        default :
+            $url = $url . "&errorMessage=$lang_err_general";
         }
     } else {
         // didn't receive any login parameters, so redirect login form