Merge pull request #64 from valadas/issue/59

Removed Telerik dependencies

AssemblyInfo.vb

@@ -49,7 +49,7 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("06.07.00.17")>
+<Assembly: AssemblyVersion("06.07.00.22")>
 
 <Assembly: AssemblyFileVersion("06.07.00.00")>
 <Assembly: ComVisibleAttribute(False)>

Components/Configuration.vb

@@ -104,8 +104,6 @@ Namespace DotNetNuke.Modules.Feedback
         Private _captchaVisibility As CaptchaVisibilities
         Private _captchaAudio As Boolean
         Private _captchaCase As Boolean
-        Private _captchaLineNoise As Telerik.Web.UI.CaptchaLineNoiseLevel
-        Private _captchaBackgroundNoise As Telerik.Web.UI.CaptchaBackgroundNoiseLevel
         Private _repeatSubmissionFilter As RepeatSubmissionFilters
         Private _repeatSubmissionInteval As Integer
         Private _duplicateSubmission As Boolean
@@ -787,8 +785,6 @@ Namespace DotNetNuke.Modules.Feedback
                 _captchaVisibility = GetCaptchaVisibility() 'Handles legacy UseCaptcha setting
                 _captchaAudio = GetSetting("Feedback_CaptchaAudio", False)
                 _captchaCase = GetSetting("Feedback_CaptchaCase", True)
-                _captchaLineNoise = GetCaptchaLineNoise()
-                _captchaBackgroundNoise = GetCaptchaBackgroundNoise()
 
                 'Issue #22 NoCaptcha support
                 _useNoCaptcha = GetSetting("Feedback_UseNoCaptcha", False)
@@ -913,22 +909,6 @@ Namespace DotNetNuke.Modules.Feedback
             End If
         End Function
 
-        Private Function GetCaptchaLineNoise() As Telerik.Web.UI.CaptchaLineNoiseLevel
-            If _settings("Feedback_CaptchaLineNoise") IsNot Nothing Then
-                Return CType(_settings("Feedback_CaptchaLineNoise"), Telerik.Web.UI.CaptchaLineNoiseLevel)
-            Else
-                Return Telerik.Web.UI.CaptchaLineNoiseLevel.Low
-            End If
-        End Function
-
-        Private Function GetCaptchaBackgroundNoise() As Telerik.Web.UI.CaptchaBackgroundNoiseLevel
-            If _settings("Feedback_CaptchaBackgroundNoise") IsNot Nothing Then
-                Return CType(_settings("Feedback_CaptchaBackgroundNoise"), Telerik.Web.UI.CaptchaBackgroundNoiseLevel)
-            Else
-                Return Telerik.Web.UI.CaptchaBackgroundNoiseLevel.Low
-            End If
-        End Function
-
         Public Sub SaveSettings()
             SaveSettings(_moduleId)
         End Sub
@@ -955,8 +935,6 @@ Namespace DotNetNuke.Modules.Feedback
                 .UpdateModuleSetting(_moduleId, "Feedback_CaptchaVisibility", _captchaVisibility.ToString)
                 .UpdateModuleSetting(_moduleId, "Feedback_CaptchaAudio", _captchaAudio.ToString)
                 .UpdateModuleSetting(_moduleId, "Feedback_CaptchaCase", _captchaCase.ToString)
-                .UpdateModuleSetting(_moduleId, "Feedback_CaptchaLineNoise", CInt(_captchaLineNoise).ToString)
-                .UpdateModuleSetting(_moduleId, "Feedback_CaptchaBackgroundNoise", CInt(_captchaBackgroundNoise).ToString)
                 .UpdateModuleSetting(_moduleId, "Feedback_DuplicateSubmission", _duplicateSubmission.ToString)
                 .UpdateModuleSetting(_moduleId, "Feedback_RepeatSubmissionFilter", _repeatSubmissionFilter.ToString)
                 .UpdateModuleSetting(_moduleId, "Feedback_RepeatSubmissionInteval", _repeatSubmissionInteval.ToString)

DotNetNuke.Modules.Feedback.vbproj

@@ -112,11 +112,6 @@
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DotNetNuke.Web.Deprecated, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetNuke.Web.Deprecated.9.4.0\lib\net45\DotNetNuke.Web.Deprecated.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
@@ -156,11 +151,6 @@
       <Name>System.XML</Name>
     </Reference>
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="Telerik.Web.UI, Version=2013.2.717.40, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetNuke.Web.Deprecated.9.4.0\lib\net45\Telerik.Web.UI.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Import Include="DotNetNuke" />

Feedback.ascx

@@ -1,7 +1,6 @@
 <%@ Control Language="vb" AutoEventWireup="false" Explicit="True" Codebehind="Feedback.ascx.vb" Inherits="DotNetNuke.Modules.Feedback.Feedback" %>
 <%@ Register TagPrefix="dnn" Assembly="DotNetNuke.Web" Namespace="DotNetNuke.Web.UI.WebControls" %>
 <%@ Register TagPrefix="dnn" Assembly="DotNetNuke" Namespace="DotNetNuke.UI.WebControls"%>
-<%@ Register TagPrefix="dnn" Assembly="DotNetNuke.Web.Deprecated" Namespace="DotNetNuke.Web.UI.WebControls" %>
 <%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
 
 <div id="divFeedbackForm" runat="server">

Settings.ascx

@@ -166,18 +166,6 @@
                 <asp:ListItem Text="Disabled" resourcekey="Disabled" Value="3"></asp:ListItem>
             </asp:RadioButtonList>
         </div>
-        <div class="dnnFormItem">
-            <dnn:label id="plCaptchaCase" runat="server" controlname="chkCaptchaCase" suffix=":"></dnn:label>
-	        <asp:CheckBox id="chkCaptchaCase" runat="server" cssclass="normal"></asp:CheckBox>
-        </div>
-        <div class="dnnFormItem">
-            <dnn:label ID="plCaptchaLineNoise" runat="server" ControlName="ddlCaptchaLineNoise" Suffix=":" />
-            <asp:DropDownList ID="ddlCaptchaLineNoise" runat="server"></asp:DropDownList>
-        </div>
-        <div class="dnnFormItem">
-            <dnn:label ID="plCaptchaBackgroundNoise" runat="server" ControlName="ddlCaptchaBackgroundNoise" Suffix=":" />
-            <asp:DropDownList ID="ddlCaptchaBackgroundNoise" runat="server"></asp:DropDownList>
-        </div>
         <div class="dnnFormItem">
             <dnn:label id="plNoCaptcha" runat="server" controlName="chkNoCaptcha" suffix=":"></dnn:label>
             <asp:CheckBox ID="chkNoCaptcha" runat="server" CssClass="normal" AutoPostBack="true" CausesValidation="false" OnCheckedChanged="chkNoCaptcha_CheckedChanged" />

Settings.ascx.vb

@@ -195,8 +195,6 @@ Namespace DotNetNuke.Modules.Feedback
                     rblScope.SelectedValue = CInt(MyConfiguration.Scope).ToString
                     chkAsync.Checked = MyConfiguration.SendAsync
                     rblCaptchaVisibility.SelectedValue = CInt(MyConfiguration.CaptchaVisibility).ToString
-                    BindToEnum(GetType(Telerik.Web.UI.CaptchaLineNoiseLevel), ddlCaptchaLineNoise)
-                    BindToEnum(GetType(Telerik.Web.UI.CaptchaBackgroundNoiseLevel), ddlCaptchaBackgroundNoise)
 
                     ' Issue 22, NoCaptcha support
                     chkNoCaptcha.Checked = MyConfiguration.UseNoCaptcha

_buildfiles/version.txt

@@ -1 +1 @@
-6.7.0.17
+6.7.0.22

packages.config

@@ -2,7 +2,6 @@
 <packages>
   <package id="DotNetNuke.Core" version="9.4.0" targetFramework="net472" />
   <package id="DotNetNuke.Web" version="9.4.0" targetFramework="net472" />
-  <package id="DotNetNuke.Web.Deprecated" version="9.4.0" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi" version="5.2.0" targetFramework="net451" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net451" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net451" />