Peter M. Groen / knowledgetree

Commit 3254d6eac78cb67d9fa7d4eed22450763c956735

Authored by michael
1 parent 92645aae

changed includes to use new defaults 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@167 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 49 additions and 53 deletions
login.php
  View file @3254d6e
@@ -15,8 +15,10 @@ @@ -15,8 +15,10 @@
15 15
16 // main library routines and defaults 16 // main library routines and defaults
17 require_once("./config/dmsDefaults.php"); 17 require_once("./config/dmsDefaults.php");
18 -require_once("$default->owl_fs_root/lib/owl.lib.php");  
19 -require_once("$default->owl_fs_root/config/html.php"); 18 +require_once("$default->owl_fs_root/lib/db.inc");
  19 +require_once("$default->owl_fs_root/lib/dms.inc");
  20 +require_once("$default->owl_fs_root/lib/lookup.inc");
  21 +//require_once("$default->owl_fs_root/config/html.php");
20 require_once("$default->owl_fs_root/lib/control.inc"); 22 require_once("$default->owl_fs_root/lib/control.inc");
21 require_once("$default->owl_fs_root/lib/Session.inc"); 23 require_once("$default->owl_fs_root/lib/Session.inc");
22 24
@@ -24,6 +26,7 @@ require_once("$default->owl_fs_root/lib/Session.inc"); @@ -24,6 +26,7 @@ require_once("$default->owl_fs_root/lib/Session.inc");
24 // page start 26 // page start
25 // ------------------------------- 27 // -------------------------------
26 global $default; 28 global $default;
  29 +
27 if ($loginAction == "loginForm") { 30 if ($loginAction == "loginForm") {
28 // TODO: build login form using PatternMainPage 31 // TODO: build login form using PatternMainPage
29 //include("./lib/header.inc"); 32 //include("./lib/header.inc");
@@ -50,60 +53,53 @@ if ($loginAction == "loginForm") { @@ -50,60 +53,53 @@ if ($loginAction == "loginForm") {
50 //include("./lib/footer.inc"); 53 //include("./lib/footer.inc");
51 54
52 } elseif ($loginAction == "login") { 55 } elseif ($loginAction == "login") {
53 - // check the requirements  
54 - if (checkrequirements() == 1) {  
55 - // TODO: appropriate error message  
56 - echo "check requirements failed!<br>";  
57 - exit;  
58 - } else {  
59 - // set default url for login failure  
60 - $url = $url . "login.php?loginAction=loginForm";  
61 - // if requirements are met and we have a username and password to authenticate  
62 - if( isset($fUserName) && isset($fPassword) ) {  
63 - // verifies the login and password of the user  
64 - $dbAuth = new $default->authentication_class;  
65 - $userDetails = $dbAuth->login($fUserName, $fPassword); 56 + // set default url for login failure
  57 + $url = $url . "login.php?loginAction=loginForm";
  58 + // if requirements are met and we have a username and password to authenticate
  59 + if( isset($fUserName) && isset($fPassword) ) {
  60 + // verifies the login and password of the user
  61 + $dbAuth = new $default->authentication_class;
  62 + $userDetails = $dbAuth->login($fUserName, $fPassword);
66 63
67 - switch ($userDetails["status"]) {  
68 - // bad credentials  
69 - case 0:  
70 - $url = $url . "&errorMessage=$lang_loginfail";  
71 - break;  
72 - // successfully authenticated  
73 - case 1:  
74 - // start the session  
75 - $session = new Session();  
76 - $sessionID = $session->create($userDetails["user_id"]);  
77 - // add the user details array to the session  
78 - $_SESSION["userDetails"] = $userDetails;  
79 -  
80 - // check for a location to forward to  
81 - if (isset($redirect) && strlen(trim($redirect))>0) {  
82 - $url = urldecode($redirect);  
83 - // else redirect to the dashboard  
84 - } else {  
85 - $_SESSION["authorised"] = false;  
86 - $url = "control.php?action=dashboard";  
87 - }  
88 - break;  
89 - // login disabled  
90 - case 2:  
91 - $url = $url . "&errorMessage=$lang_logindisabled";  
92 - break;  
93 - // too many sessions  
94 - case 3 :  
95 - $url = $url . "&errorMessage=$lang_toomanysessions";  
96 - break;  
97 - default :  
98 - $url = $url . "&errorMessage=$lang_err_general";  
99 - }  
100 - } else {  
101 - // didn't receive any login parameters, so redirect login form  
102 - // TODO: set "no login parameters received error message?  
103 - // internal error message- should never happen 64 + switch ($userDetails["status"]) {
  65 + // bad credentials
  66 + case 0:
  67 + $url = $url . "&errorMessage=$lang_loginfail";
  68 + break;
  69 + // successfully authenticated
  70 + case 1:
  71 + // start the session
  72 + $session = new Session();
  73 + $sessionID = $session->create($userDetails["user_id"]);
  74 + // add the user details array to the session
  75 + $_SESSION["userDetails"] = $userDetails;
  76 +
  77 + // check for a location to forward to
  78 + if (isset($redirect) && strlen(trim($redirect))>0) {
  79 + $url = urldecode($redirect);
  80 + // else redirect to the dashboard
  81 + } else {
  82 + $_SESSION["authorised"] = false;
  83 + $url = "control.php?action=dashboard";
  84 + }
  85 + break;
  86 + // login disabled
  87 + case 2:
  88 + $url = $url . "&errorMessage=$lang_logindisabled";
  89 + break;
  90 + // too many sessions
  91 + case 3 :
  92 + $url = $url . "&errorMessage=$lang_toomanysessions";
  93 + break;
  94 + default :
  95 + $url = $url . "&errorMessage=$lang_err_general";
104 } 96 }
105 - redirect($url); 97 + } else {
  98 + // didn't receive any login parameters, so redirect login form
  99 + // TODO: set "no login parameters received error message?
  100 + // internal error message- should never happen
106 } 101 }
  102 + redirect($url);
107 } 103 }
108 ?> 104 ?>
109 105