Fixes captcha not working, adds recaptcha support, fixes msbuild nuget reference preventing build in some environments.

Author: valadas

DotNetNuke.Modules.UserDefinedTable.xml

@@ -346,7 +346,32 @@ void BuildEditForm()
                     editForm.Add(currentField);
                 }
             }
-            BuildCssForm(editForm);
+            if (CaptchaNeeded())
+            {
+                _ctlCaptcha = new CaptchaControl
+                {
+                    ID = "Captcha",
+                    CaptchaWidth = Unit.Pixel(130),
+                    CaptchaHeight = Unit.Pixel(40),
+                    ToolTip = Localization.GetString("CaptchaToolTip", LocalResourceFile),
+                    ErrorMessage = Localization.GetString("CaptchaError", LocalResourceFile)
+                };
+                currentField = new FormColumnInfo
+                {
+                    Title = Localization.GetString("Captcha", LocalResourceFile),
+                    EditControl = _ctlCaptcha,
+                    Visible = true,
+                    IsUserDefinedField = false
+                };
+                editForm.Add(currentField);
+            }
+
+            var enableFormTemplate = Settings.EnableFormTemplate;
+            var formTemplate = Settings.FormTemplate;
+            if (enableFormTemplate && !string.IsNullOrEmpty(formTemplate))
+                BuildTemplateForm(editForm, formTemplate);
+            else
+                BuildCssForm(editForm);
             //Change captions of buttons in Form mode
             if (IsNewRow && Settings.ListOrForm.Contains("Form"))
             {
@@ -394,12 +419,14 @@ void Page_Load(object sender, EventArgs e)
                 if (ModuleContext.PortalSettings.UserId == -1 && Settings.ForceCaptchaForAnonymous && Settings.PreferReCaptcha)
                 {
                     cmdUpdate.Attributes["disabled"] = "disabled";
+                    cmdUpdate.CssClass += " disabled";
 
                     DotNetNuke.Framework.CDefault page = (DotNetNuke.Framework.CDefault)this.Page;
                     StringBuilder sb = new StringBuilder();
                     sb.AppendLine(@"<script type=""text/javascript"">");
                     sb.AppendLine("var onSubmit = function(token) {");
                     sb.AppendLine("$('#" + cmdUpdate.ClientID + "').removeAttr('disabled');");
+                    sb.AppendLine("$('#" + cmdUpdate.ClientID + "').removeClass('disabled');");
                     sb.AppendLine("};");
                     sb.AppendLine("var onloadCallback = function() {");
                     sb.AppendLine("grecaptcha.render('" + gRecaptcha.ClientID + "', {");

Form.ascx.cs

@@ -67,6 +67,10 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="DotNetNuke.Web, Version=9.0.0.1002, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\bin\DotNetNuke.Web.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="DotNetNuke.Web.Client, Version=7.4.2.216, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\DotNetNuke.Web.Client.7.4.2.216\lib\net40\DotNetNuke.Web.Client.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
@@ -387,12 +391,12 @@
   <ItemGroup>
     <None Include="FormAndList.dnn" />
   </ItemGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
   <PropertyGroup>
     <Extension>zip</Extension>

FormAndList.csproj

@@ -63,10 +63,12 @@ public override void UpdateSettings()
                     break;
                 case 1:
                     // DnnCaptcha
+                    mc.UpdateModuleSetting(ModuleId, SettingName.ForceCaptchaForAnonymous, true.ToString());
                     mc.UpdateModuleSetting(ModuleId, SettingName.PreferReCaptcha, false.ToString());
                     break;
                 case 2:
                     // ReCaptcha
+                    mc.UpdateModuleSetting(ModuleId, SettingName.ForceCaptchaForAnonymous, true.ToString());
                     mc.UpdateModuleSetting(ModuleId, SettingName.PreferReCaptcha, true.ToString());
                     break;
                 default:

Settings.ascx.cs

@@ -5,7 +5,7 @@
 <div runat="server" id="divForm"  class="dnnForm fnlForm dnnClear">
 
     <div runat="server" ID="EditFormPlaceholder"  />
-    <asp:Panel ID="gRecaptcha" runat="server" />
+    <asp:Panel ID="gRecaptcha" CssClass="recaptcha-container" runat="server" />
     <ul class="dnnActions dnnClear">
         <li>
             <asp:LinkButton ID="cmdUpdate" Text="Update" runat="server" resourcekey="cmdUpdate" cssclass="dnnPrimaryAction reCaptchaSubmit" />