Merge pull request #4453 from lambdageek/bug-49721

[mono.git] / mcs / class / System.Web / System.Web.UI.WebControls / FormParameter.cs

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormParameter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormParameter.cs
index 8c2903fcb9369f4875dd52813a025641e6b9556c..56ad7b4a1dfd4b77986f0b0c24119ed88e7041ce 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/FormParameter.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/FormParameter.cs
@@ -7,14 +7,38 @@
 // (C) 2003 Ben Maurer
 //
 
-#if NET_1_2
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Collections;
 using System.Collections.Specialized;
+using System.Data;
 using System.Text;
+using System.ComponentModel;
 
-namespace System.Web.UI.WebControls {
-       public class FormParameter : Parameter {
-
+namespace System.Web.UI.WebControls
+{
+       [DefaultPropertyAttribute ("FormField")]
+       public class FormParameter : Parameter
+       {
                public FormParameter () : base ()
                {
                }
@@ -33,27 +57,34 @@ namespace System.Web.UI.WebControls {
                {
                        FormField = formField;
                }
+
+               public FormParameter (string name, DbType dbType, string formField) : base (name, dbType)
+               {
+                       FormField = formField;
+               }
                
                protected override Parameter Clone ()
                {
                        return new FormParameter (this);
                }
-               
-               protected override object Evaluate (Control control)
+               protected internal
+               override object Evaluate (HttpContext context, Control control)
                {
-                       if (control == null || control.Page == null || control.Page.Request == null)
+                       HttpRequest req = context != null ? context.Request : null;
+                       if (req == null)
                                return null;
                        
-                       return control.Page.Request.Form [FormField];
+                       return req.Form [FormField];
                }
                
+               [DefaultValueAttribute ("")]
                public string FormField {
                        get {
                                string s = ViewState ["FormField"] as string;
                                if (s != null)
                                        return s;
                                
-                               return "";
+                               return String.Empty;
                        }
                        set {
                                if (FormField != value) {
@@ -64,5 +95,5 @@ namespace System.Web.UI.WebControls {
                }
        }
 }
-#endif
+