make index.php intermittently call-able again

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@414 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

diff --git a/www/inc/loader_nonadmin.php b/www/inc/loader_nonadmin.php
index 7ee0944..67a3aa8 100644 (file)
--- a/www/inc/loader_nonadmin.php
+++ b/www/inc/loader_nonadmin.php
@@ -4,5 +4,6 @@ if(!$db->canUseDb())
        die("Database is not correctly configured. Giving up.");
 //load class-files
 include('./inc/classes/autoload.php');
+include("./inc/machine/autoload.php");
 
 ?>
\ No newline at end of file

diff --git a/www/inc/machine/session.php b/www/inc/machine/session.php
index fe9e70f..a61cebf 100644 (file)
--- a/www/inc/machine/session.php
+++ b/www/inc/machine/session.php
@@ -215,6 +215,7 @@ class DummyWebSession extends Session
 {
        public function __construct()
        {
+               global $db;
                //there is no real user for web (so far)
                $this->user="(web)";
                //fake web role, web pages check for it

diff --git a/www/machine.php b/www/machine.php
index bb057a7..8e32cc1 100644 (file)
--- a/www/machine.php
+++ b/www/machine.php
@@ -5,7 +5,6 @@ header("Content-Type: application/x-MagicSmoke");
 //initialize
 include("inc/loader.php");
 include("inc/loader_nonadmin.php");
-include("./inc/machine/autoload.php");
 
 //let wob do the rest
 WobTransaction::handle();