diff --git a/control.php b/control.php index 624ab18..199daa6 100644 --- a/control.php +++ b/control.php @@ -1,20 +1,19 @@ Michael Joseph, Jam Warehouse (Pty) Ltd, South Africa - * @package dms + * @package dmslib */ // main library routines and defaults @@ -22,7 +21,6 @@ require_once("./config/dmsDefaults.php"); require_once("$default->owl_fs_root/lib/db.inc"); require_once("$default->owl_fs_root/lib/dms.inc"); require_once("$default->owl_fs_root/lib/lookup.inc"); -//require_once("$default->owl_fs_root/config/html.php"); require_once("$default->owl_fs_root/lib/control.inc"); require_once("$default->owl_fs_root/lib/Session.inc"); require_once("$default->owl_fs_root/lib/SiteMap.inc"); @@ -32,14 +30,12 @@ require_once("$default->owl_fs_root/lib/SiteMap.inc"); // ------------------------------- if (checkSession()) { - // session check succeeds, so default action should be the dashboard - // (if no action specified + // session check succeeds, so default action should be the dashboard if no action was specified if (!isset($action)) { $action = "dashboard"; } } else { - // session check fails, so default action should be the login form - // (if no action specified) + // session check fails, so default action should be the login form if no action was specified if (!isset($action)) { $action = "loginForm"; } @@ -48,11 +44,10 @@ if (checkSession()) { // reset authorisation flag before checking access $_SESSION["authorised"] = false; -$default->log->debug("control.php about to retrieve page from sitemap"); // check whether the users group has access to the requested page $page = $default->siteMap->getPage($action, $_SESSION["groupID"]); -$default->log->debug("control.php retrieved page=$page"); +$default->log->debug("control.php retrieved page=$page from SiteMap"); if (!$page) { // this group doesn't have permission to access the page // or there is no page mapping for the requested action