From 375b2109b140af52374dfadd68a11a63699eadda Mon Sep 17 00:00:00 2001
From: duergner <duergner>
Date: Mon, 15 Mar 2004 17:34:35 +0000
Subject: [PATCH] *** empty log message ***

---
 lam/docs/modules-specification.htm |  6 ------
 lam/templates/help.php             | 22 +++++++++++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lam/docs/modules-specification.htm b/lam/docs/modules-specification.htm
index cc723d8b..aa54ae88 100644
--- a/lam/docs/modules-specification.htm
+++ b/lam/docs/modules-specification.htm
@@ -438,12 +438,6 @@ placeholder for variables passed to this help entry. The placeholder must follow
 placeholder defined by the PHP <b>printf</b> function. HTML/CSS elements are allowed here as long 
 as they follow the XHTML1.0 Strict specification.
 <br><br>
-<span style="font-weight: bold;">Variables</span> <span style="font-style: italic;">(OPTIONAL)</span> 
-<br>An array of variables used as arguments for the formated string submitted in the <b>Text</b> 
-field. This may be but must not be an assiciated array where each argument to be passed on is a 
-single row in the array. This array may only consist of types that can be passed as arguments to PHP's 
-<b>printf</b> function. 
-<br><br>
 <span style="font-weight: bold;">SeeAlso</span> <span style="font-style: italic;">(OPTIONAL)</span> 
 <br>An array of references to anonther related subjects. Each row of the array must contain a field 
 called "text" with the text that should be displayed and may contain a field called "link" which is used 
diff --git a/lam/templates/help.php b/lam/templates/help.php
index 7fc768a0..fe3eac47 100644
--- a/lam/templates/help.php
+++ b/lam/templates/help.php
@@ -56,7 +56,7 @@ function echoHTMLFoot()
 }
 
 /* Print help site */
-function displayHelp($helpEntry) {
+function displayHelp($helpEntry,$helpVariables) {
 	/* Load external help page */
 	if($helpEntry["ext"] == "TRUE")
 	{
@@ -67,11 +67,6 @@ function displayHelp($helpEntry) {
 	/* Print help site out of $helpEntry */
 	else
 	{
-		$helpVariables = array();
-		while($current = current($helpEntry['Variables'])) {
-			array_push($helpVariables,$current);
-			next($helpEntry['variables']);
-		}
 		echoHTMLHead();
 		echo "		<h1 class=\"help\">" . $helpEntry['Headline'] . "</h1>\n";
 		$format = "		<p class=\"help\">" . $helpEntry['Text'] . "</p>\n";
@@ -119,6 +114,19 @@ else {
 	}
 }
 
-displayHelp($helpEntry);
+$i = 1;
+$moreVariables = true;
+$helpVariables = array();
+while($moreVariables) {
+	if(isset($_GET['var' . $i])) {
+		array_push($helpVariables,$_GET['var' . $i]);
+		$i++;
+	}
+	else {
+		$moreVariables = false;
+	}
+}
+
+displayHelp($helpEntry,$helpVariables);
 
 ?>
\ No newline at end of file