From 32d2230ef5d5f7dc46c6cf5ce2b28e8da2c433c9 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Fri, 31 May 2002 14:14:37 +0000
Subject: [PATCH] Updated code to new session/app/req/res object layout.

---
 Application/main.hac    |  4 ++--
 DocApplication/main.hac |  8 ++++----
 DocFunction/main.hac    |  6 +++---
 DocPrototype/main.hac   |  6 +++---
 Global/functions.js     | 41 +++++++++++++++++++++--------------------
 Root/main.hac           |  8 +++-----
 6 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/Application/main.hac b/Application/main.hac
index 40a43c35..016058d0 100644
--- a/Application/main.hac
+++ b/Application/main.hac
@@ -5,6 +5,6 @@
 if ( checkAddress()==false )	return;
 if ( checkAuth(this)==false )	return;
 
-res.skin="global";
-res.body = this.renderSkinAsString("main");
+res.data.body = this.renderSkinAsString("main");
+renderSkin ("global");
 
diff --git a/DocApplication/main.hac b/DocApplication/main.hac
index cac9f238..f61fec7c 100644
--- a/DocApplication/main.hac
+++ b/DocApplication/main.hac
@@ -12,12 +12,12 @@ if ( req.data.action=="reload" )	{
 }
 
 if ( req.data.action=="index" )	{
-	res.body = this.renderSkinAsString("index");
+	res.data.body = this.renderSkinAsString("index");
 }	else	{
-	res.body = this.renderSkinAsString("main");
+	res.data.body = this.renderSkinAsString("main");
 }
 
-res.skin = "api";
-res.title = "Application " + this.name;
+res.data.title = "Application " + this.name;
+renderSkin("api");
 
 
diff --git a/DocFunction/main.hac b/DocFunction/main.hac
index ef413f29..6faae50d 100644
--- a/DocFunction/main.hac
+++ b/DocFunction/main.hac
@@ -1,8 +1,8 @@
 if ( checkAddress()==false )	return;
 if ( checkAuth(this)==false )	return;
 
-res.body = this.renderSkinAsString("main");
-res.skin = "api";
-res.title = "Application " + this.name;
+res.data.body = this.renderSkinAsString("main");
+res.data.title = "Application " + this.name;
+renderSkin("api");
 
 
diff --git a/DocPrototype/main.hac b/DocPrototype/main.hac
index ef413f29..77ebcb02 100644
--- a/DocPrototype/main.hac
+++ b/DocPrototype/main.hac
@@ -1,8 +1,8 @@
 if ( checkAddress()==false )	return;
 if ( checkAuth(this)==false )	return;
 
-res.body = this.renderSkinAsString("main");
-res.skin = "api";
-res.title = "Application " + this.name;
+res.data.body = this.renderSkinAsString("main");
+res.data.title = "Application " + this.name;
+renderSkin ("api");
 
 
diff --git a/Global/functions.js b/Global/functions.js
index 97d90318..14c917ad 100644
--- a/Global/functions.js
+++ b/Global/functions.js
@@ -3,19 +3,19 @@
 /**
   * scheduler function, runs global.appStat every minute
   */
-function scheduler()	{
+function scheduler() {
 	appStat();
 	return 60000;
 }
 
 
 /**
-  * initializes app.requestStat storage on startup,
-  * creates app.addressFilter
+  * initializes app.data.requestStat storage on startup,
+  * creates app.data.addressFilter
   */
-function onStart()	{
-	app.requestStat = new HopObject();
-	app.addressFilter = createAddressFilter();
+function onStart() {
+	app.data.requestStat = new HopObject();
+	app.data.addressFilter = createAddressFilter();
 }
 
 /**
@@ -36,29 +36,29 @@ function createAddressFilter()	{
 				var result = tryEval("filter.addAddress(str);");
 			}
 			if ( result.error==null )	{
-				app.__app__.logEvent( "allowed address for app manage: " + str );
+				app.log( "allowed address for app manage: " + str );
 			}
 		}
 	}	else	{
-		app.__app__.logEvent("no addresses allowed for app manage, all access will be denied");
+		app.log("no addresses allowed for app manage, all access will be denied");
 	}
 	return filter;
 }
 
 
 /** 
-  * updates the request stats in app.requestStat every 5 minutes
+  * updates the request stats in app.data.requestStat every 5 minutes
   */
 function appStat()	{
-	if ( app.requestStat==null )	{
-		app.requestStat = new HopObject();
+	if ( app.data.requestStat==null )	{
+		app.data.requestStat = new HopObject();
 	}
-	if( (new Date()-300000) < app.requestStat.lastRun )	{
+	if( (new Date()-300000) < app.data.requestStat.lastRun )	{
 		return;
 	}
 	var arr = root.getApplications();
 	for ( var i=0; i<arr.length; i++ )	{
-		var tmp = app.requestStat.get(arr[i].getName());
+		var tmp = app.data.requestStat.get(arr[i].getName());
 		if ( tmp==null )	{
 			tmp = new HopObject();
 			tmp.lastTotal = 0;
@@ -67,9 +67,9 @@ function appStat()	{
 		var ct = arr[i].getRequestCount();
 		tmp.last5Min = ct - tmp.lastTotal;
 		tmp.lastTotal = ct;
-		app.requestStat.set(arr[i].getName(), tmp);
+		app.data.requestStat.set(arr[i].getName(), tmp);
 	}
-	app.requestStat.lastRun = new Date();
+	app.data.requestStat.lastRun = new Date();
 }
 
 
@@ -116,8 +116,8 @@ function checkAuth(appObj)	{
 		return createAuth();
 	}
 
-	var uname = req.getUsername();
-	var pwd   = req.getPassword();
+	var uname = req.username;
+	var pwd   = req.password;
 
 	if ( uname==null || uname=="" || pwd==null || pwd=="" )
 		return forceAuth();
@@ -145,8 +145,8 @@ function checkAuth(appObj)	{
   * check access to the base-app by ip-addresses
   */
 function checkAddress()	{
-	if ( !app.addressFilter.matches(java.net.InetAddress.getByName(req.data.http_remotehost)) )	{
-		app.__app__.logEvent("denied request from " + req.data.http_remotehost );
+	if ( !app.data.addressFilter.matches(java.net.InetAddress.getByName(req.data.http_remotehost)) )	{
+		app.log("denied request from " + req.data.http_remotehost );
 		return forceStealth();
 	}	else	{
 		return true;
@@ -213,7 +213,7 @@ function createAuth()	{
 		f.open();
 		f.write(str);
 		f.close();
-		app.__app__.logEvent( req.data.http_remotehost + " saved new adminUsername/adminPassword to server.properties");
+		app.log( req.data.http_remotehost + " saved new adminUsername/adminPassword to server.properties");
 		res.redirect ( root.href("main") );
 	
 	}	else	{
@@ -227,3 +227,4 @@ function createAuth()	{
 	}
 }
 
+
diff --git a/Root/main.hac b/Root/main.hac
index f2f4bd0c..f05009fa 100644
--- a/Root/main.hac
+++ b/Root/main.hac
@@ -1,4 +1,3 @@
-
 /**
   * main action, show server-stats
   * perform start, stop, restart and flush-action
@@ -40,7 +39,6 @@ if ( req.data.app!=null && req.data.app!="" && req.data.action!=null && req.data
 // output only to root
 if ( checkAuth()==false )	return;
 
-res.skin = "global";
-res.title = "Helma Object Publisher - Serverinfo";
-res.body = this.renderSkinAsString("main");
-
+res.data.title = "Helma Object Publisher - Serverinfo";
+res.data.body = this.renderSkinAsString("main");
+renderSkin("global");