From c9a7131773dcd295938824d32547c1b014157e94 Mon Sep 17 00:00:00 2001
From: pate <pate>
Date: Thu, 25 Apr 2002 23:35:17 +0000
Subject: [PATCH] found a cleaner way to do &mkformnotable, and refactored
 tests to allow it.

---
 C4/Output.pm | 26 ++++++++++----------------
 output.t     | 18 +++++++++---------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/C4/Output.pm b/C4/Output.pm
index 0e0b58089a..5f47ee8dd4 100644
--- a/C4/Output.pm
+++ b/C4/Output.pm
@@ -267,26 +267,20 @@ sub mkformnotable{
   my ($action,@inputs)=@_;
   my $string="<form action=$action method=post>\n";
   foreach my $input (@inputs){
-      if ($$input[0] eq 'hidden'){
+      if ($$input[0] eq 'textarea') {
 	  $string .= 
-	      "<input type=hidden name=$$input[1] value=\"$$input[2]\">\n";
-      } elsif ($$input[0] eq 'radio') {
+	      "<textarea name=$$input[1] wrap=physical cols=40 rows=4>";
 	  $string .= 
-	      "<input type=radio name=$$input[1] value=$$input[2]>$$input[2]";
-      } elsif ($$input[0] eq 'text') {
+	      "$$input[2]</textarea>";
+      } else {
 	  $string .= 
 	      "<input type=$$input[0] name=$$input[1] value=\"$$input[2]\">";
-      } elsif ($$input[0] eq 'textarea') {
-        $string .= 
-	    "<textarea name=$$input[1] wrap=physical cols=40 rows=4>";
-	$string .= 
-	    "$$input[2]</textarea>";
-    } elsif ($$input[0] eq 'reset'){
-	$string .= 
-	    "<input type=reset name=$$input[1] value=\"$$input[2]\">";
-    } elsif ($$input[0] eq 'submit'){
-      $string.="<input type=submit name=$$input[1] value=\"$$input[2]\">";
-    }    
+	  if ($$input[0] eq 'radio') {
+	      $string .= 
+	      "$$input[2]";
+	  }  
+      }
+      $string .= "\n";
   }
   $string=$string."</form>";
 }
diff --git a/output.t b/output.t
index 6d9c46853e..059c2c6788 100644
--- a/output.t
+++ b/output.t
@@ -190,7 +190,7 @@ if ($return eq mkformnotable('actionurl', @inputs)) {
 # 1 input; radio
 @inputs = (\@inputRadio);
 $return ="<form action=actionurl method=post>\n";
-$return .= "<input type=radio name=radioname value=radiovalue>radiovalue";
+$return .= "<input type=radio name=radioname value=\"radiovalue\">radiovalue\n";
 $return .= "</form>";
 
 if ($return eq mkformnotable('actionurl', @inputs)) {
@@ -202,7 +202,7 @@ if ($return eq mkformnotable('actionurl', @inputs)) {
 # 1 input; text
 @inputs = (\@inputText);
 $return = "<form action=actionurl method=post>\n";
-$return .= "<input type=text name=textname value=\"textvalue\">";
+$return .= "<input type=text name=textname value=\"textvalue\">\n";
 $return .= "</form>";
 
 if ($return eq mkformnotable('actionurl', @inputs)) {
@@ -215,7 +215,7 @@ if ($return eq mkformnotable('actionurl', @inputs)) {
 # 1 input; textarea
 @inputs = (\@inputTextarea);
 $return = "<form action=actionurl method=post>\n";
-$return .= "<textarea name=textareaname wrap=physical cols=40 rows=4>textareavalue</textarea>";
+$return .= "<textarea name=textareaname wrap=physical cols=40 rows=4>textareavalue</textarea>\n";
 $return .= "</form>";
 
 if ($return eq mkformnotable('actionurl', @inputs)) {
@@ -227,7 +227,7 @@ if ($return eq mkformnotable('actionurl', @inputs)) {
 # 1 input; submit
 @inputs = (\@inputSubmit);
 $return = "<form action=actionurl method=post>\n";
-$return .= "<input type=submit name=submitname value=\"submitvalue\">";
+$return .= "<input type=submit name=submitname value=\"submitvalue\">\n";
 $return .= "</form>";
 
 if ($return eq mkformnotable('actionurl', @inputs)) {
@@ -239,7 +239,7 @@ if ($return eq mkformnotable('actionurl', @inputs)) {
 # 1 input; reset
 @inputs = (\@inputReset);
 $return = "<form action=actionurl method=post>\n";
-$return .= "<input type=reset name=resetname value=\"resetvalue\">";
+$return .= "<input type=reset name=resetname value=\"resetvalue\">\n";
 $return .= "</form>";
 
 if ($return eq mkformnotable('actionurl', @inputs)) {
@@ -252,7 +252,7 @@ if ($return eq mkformnotable('actionurl', @inputs)) {
 @inputs = (\@inputHidden, \@inputSubmit);
 $return = "<form action=actionurl method=post>\n";
 $return .= "<input type=hidden name=hiddenname value=\"hiddenvalue\">\n";
-$return .= "<input type=submit name=submitname value=\"submitvalue\">";
+$return .= "<input type=submit name=submitname value=\"submitvalue\">\n";
 $return .= "</form>";
 
 if ($return eq mkformnotable('actionurl', @inputs)) {
@@ -265,9 +265,9 @@ if ($return eq mkformnotable('actionurl', @inputs)) {
 # 3 inputs; text, submit, and reset
 @inputs = (\@inputText, \@inputSubmit, \@inputReset);
 $return = "<form action=actionurl method=post>\n";
-$return .= "<input type=text name=textname value=\"textvalue\">";
-$return .= "<input type=submit name=submitname value=\"submitvalue\">";
-$return .= "<input type=reset name=resetname value=\"resetvalue\">";
+$return .= "<input type=text name=textname value=\"textvalue\">\n";
+$return .= "<input type=submit name=submitname value=\"submitvalue\">\n";
+$return .= "<input type=reset name=resetname value=\"resetvalue\">\n";
 $return .= "</form>";
 
 if ($return eq mkformnotable('actionurl', @inputs)) {
-- 
2.39.5