summaryrefslogtreecommitdiffstats
path: root/app/controller/root.control.php
diff options
context:
space:
mode:
authorMalf Furious <m@lfurio.us>2016-02-07 14:01:22 -0500
committerMalf Furious <m@lfurio.us>2016-02-07 14:01:22 -0500
commit72e37180b69db2c067b926b54c64e1989bef0be4 (patch)
treed5e76f4894d3822f1923464c641c63fa283bdd2b /app/controller/root.control.php
parent43ca317ea7d49396eb2958a38aed8b737ef4186b (diff)
parentc5564a0a2ae183c533a38905eccdbf383030cd4c (diff)
downloadscrott-72e37180b69db2c067b926b54c64e1989bef0be4.tar.gz
scrott-72e37180b69db2c067b926b54c64e1989bef0be4.zip
Merge branch 'auth' into dev
Diffstat (limited to 'app/controller/root.control.php')
-rw-r--r--app/controller/root.control.php15
1 files changed, 14 insertions, 1 deletions
diff --git a/app/controller/root.control.php b/app/controller/root.control.php
index 437cae1..06abf27 100644
--- a/app/controller/root.control.php
+++ b/app/controller/root.control.php
@@ -2,6 +2,7 @@
require_once "class/controller.class.php";
require_once "controller/sysconf.control.php";
+require_once "controller/auth.control.php";
/*
* Root-level controller for Scrott app. This object will delegate the page request to the
@@ -27,8 +28,20 @@ class Root extends Controller
}
/* TODO */
+ /* TODO -- only auth if logged out */
+ else if (!$this->getCurrentUser())
+ {
+ $ctrl = new Auth();
+ $ctrl->handle($argv);
+ }
+
else
- echo "Configuration is present!";
+ {
+ echo "logged in as:!";
+ echo "<pre>";
+ var_dump($this->getCurrentUser());
+ echo "</pre>";
+ }
}
/*