Move remaining options out of environment

4 files changed, 10 insertions, 10 deletions

diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp
index 654c2ce..75bc004 100644
--- a/project2/cgi/cgiAppEngine.cpp
+++ b/project2/cgi/cgiAppEngine.cpp
@@ -105,7 +105,7 @@ CgiApplicationEngine::process() const
 	if (!sessionEmpty || !cursession->Empty()) {
 		sessionsContainer->SaveSession(cursession);
 		header->setCookie(cgicc::HTTPCookie(SESSIONID, boost::lexical_cast<std::string>(cursession->ID()), "Session ID",
-					_env->getServerName().substr(_env->getServerName().find(".")), env()->sessionTimeOut, "/", false));
+					_env->getServerName().substr(_env->getServerName().find(".")), SessionContainer::sessionTimeOut, "/", false));
 	}
 	if (TransformSourcePtr ts = currentStage.get<2>()) {
 		TransformSourcePtr final = finalTransformSource(ts);
@@ -162,7 +162,7 @@ CgiApplicationEngine::addEnvData(const MultiRowSetPresenter * p, OutputOptionsPt
 {
 	if (!o || o->Environment()) {
 		// Environment set up by web server
-		p->addNewRowSet("environment", env()->scriptNamespacePrefix);
+		p->addNewRowSet("environment", Scripts::scriptNamespacePrefix);
 		// Server stuff
 		addEnvToPresenter(p, "servername", &cgicc::CgiEnvironment::getServerName);
 		addEnvToPresenter(p, "serversoftware", &cgicc::CgiEnvironment::getServerSoftware);
@@ -179,7 +179,7 @@ CgiApplicationEngine::addEnvData(const MultiRowSetPresenter * p, OutputOptionsPt
 	
 	if (!o || o->URL()) {
 		// URL elements
-		p->addNewRowSet("uriElems", env()->scriptNamespacePrefix);
+		p->addNewRowSet("uriElems", Scripts::scriptNamespacePrefix);
 		p->addAttribute("full", _env->getRedirectURL());
 		_env->router->present(p);
 		p->finishRowSet();
@@ -187,7 +187,7 @@ CgiApplicationEngine::addEnvData(const MultiRowSetPresenter * p, OutputOptionsPt
 
 	if (!o || o->Parameters()) {
 		// Parameters
-		p->addNewRowSet("params", env()->scriptNamespacePrefix);
+		p->addNewRowSet("params", Scripts::scriptNamespacePrefix);
 		BOOST_FOREACH(cgicc::FormEntry fe, _env->cgi->getElements()) {
 			p->addNamedValue(fe.getName(), fe.getValue());
 		}
@@ -209,7 +209,7 @@ CgiApplicationEngine::addAppData(const MultiRowSetPresenter * p, OutputOptionsPt
 	}
 	if (!outputCachingActive && (!cursession->Empty()) && (!o || o->Session())) {
 		// Sessions variables
-		p->addNewRowSet("session", env()->scriptNamespacePrefix);
+		p->addNewRowSet("session", Scripts::scriptNamespacePrefix);
 		p->addAttribute("id", boost::lexical_cast<Glib::ustring>(cursession->ID()));
 		cursession->ForeachValue(boost::bind(&CgiApplicationEngine::addVarToPresenter, this, p, _1, _2));
 		p->finishRowSet();
@@ -217,7 +217,7 @@ CgiApplicationEngine::addAppData(const MultiRowSetPresenter * p, OutputOptionsPt
 
 	if (!outputCachingActive && (!o || o->Timing())) {
 		// Timing info
-		p->addNewRowSet("timing", env()->scriptNamespacePrefix);
+		p->addNewRowSet("timing", Scripts::scriptNamespacePrefix);
 		p->addAttribute("start", startTime);
 		if (!endTime.is_not_a_date_time()) {
 			p->addAttribute("end", endTime);
diff --git a/project2/cgi/cgiProgRouter.cpp b/project2/cgi/cgiProgRouter.cpp
index d187de2..e8ae15d 100644
--- a/project2/cgi/cgiProgRouter.cpp
+++ b/project2/cgi/cgiProgRouter.cpp
@@ -35,7 +35,7 @@ class RoutingTable {
 		}
 		void setRouteScript()
 		{
-			routeScript = ScriptReader::resolveScript(Environment::getCurrent()->datasourceRoot, routeScriptPath, true);
+			routeScript = ScriptReader::resolveScript(CommonObjects::datasourceRoot, routeScriptPath, true);
 			routeScript->loader.addLoadTarget(routeScript->root(), Storer::into<ElementLoader>(&routes));
 			routes.clear();
 			routeScript->load(NULL, true);
diff --git a/project2/cgi/cgiStageDefaultError.cpp b/project2/cgi/cgiStageDefaultError.cpp
index b8f0b4b..4c3eefe 100644
--- a/project2/cgi/cgiStageDefaultError.cpp
+++ b/project2/cgi/cgiStageDefaultError.cpp
@@ -36,8 +36,8 @@ CgiApplicationEngine::NextStage
 CgiApplicationEngine::DefaultErrorStage::run()
 {
 	pres->init();
-	pres->addNamedValue("error-type", env()->scriptNamespacePrefix, buf);
-	pres->addNamedValue("error-what", env()->scriptNamespacePrefix, what.c_str());
+	pres->addNamedValue("error-type", Scripts::scriptNamespacePrefix, buf);
+	pres->addNamedValue("error-what", Scripts::scriptNamespacePrefix, what.c_str());
 	return NextStage(NULL, this, pres.get(), pres.get());
 }
 
diff --git a/project2/cgi/cgiStageDefaultNotFound.cpp b/project2/cgi/cgiStageDefaultNotFound.cpp
index 5b68bc6..e497058 100644
--- a/project2/cgi/cgiStageDefaultNotFound.cpp
+++ b/project2/cgi/cgiStageDefaultNotFound.cpp
@@ -24,7 +24,7 @@ CgiApplicationEngine::NextStage
 CgiApplicationEngine::DefaultNotFoundStage::run()
 {
 	pres->init();
-	pres->addNamedValue("missing-resource", env()->scriptNamespacePrefix, nf.what());
+	pres->addNamedValue("missing-resource", Scripts::scriptNamespacePrefix, nf.what());
 	return NextStage(NULL, this, pres.get(), pres.get());
 }