Skip to content
This repository has been archived by the owner on Feb 12, 2019. It is now read-only.

Commit

Permalink
Fix the module icons and build scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
jbrinkman committed Sep 17, 2015
1 parent 1f6115a commit db49d2a
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 48 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,4 @@ Thumbs.db
Desktop.ini

Website/Install/Temp/
install/
2 changes: 1 addition & 1 deletion BuildScripts/MSBuild.Community.Tasks.Targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildCommunityTasksPath Condition="'$(MSBuildCommunityTasksPath)' == ''">$(MSBuildProjectDirectory)\BuildScripts</MSBuildCommunityTasksPath>
<MSBuildDnnBinPath Condition="'$(MSBuildDnnBinPath)' == ''">$(MSBuildProjectDirectory)\..\..\bin</MSBuildDnnBinPath>
<MSBuildDnnBinPath Condition="'$(MSBuildDnnBinPath)' == ''">$(MSBuildProjectDirectory)\..\..\..\bin</MSBuildDnnBinPath>
<MSBuildCommunityTasksLib>$(SolutionDir)\packages\MSBuildTasks.1.4.0.61\tools\MSBuild.Community.Tasks.dll</MSBuildCommunityTasksLib>
</PropertyGroup>
<UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.AspNet.InstallAspNet" />
Expand Down
5 changes: 3 additions & 2 deletions Components/Checks/CheckUnexpectedExtensions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Linq;

namespace DNN.Modules.SecurityAnalyzer.Components.Checks
{
Expand All @@ -9,8 +10,8 @@ public CheckResult Execute()
var result = new CheckResult(SeverityEnum.Unverified, "CheckUnexpectedExtensions");
try
{
var investigatefiles = Utility.FindFiles("*.asp;*.php");
if (investigatefiles.Length > 0)
var investigatefiles = Utility.FindUnexpectedExtensions();
if (investigatefiles.Count() > 0)
{
result.Severity = SeverityEnum.Failure;
foreach (var filename in investigatefiles)
Expand Down
4 changes: 2 additions & 2 deletions Components/FeatureController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ public string UpgradeModule(string version)
//Add Extensions Host Page
var moduleDefId = GetModuleDefinition("SecurityAnalyzer", "SecurityAnalyzer");
var auditPage = AddHostPage("Security Analyzer", "Audit site security for best practices.",
"~/images/icon_extensions_16px.gif", "~/images/icon_extensions_32px.gif", true);
"~/Icons/Sigma/Extensions_16x16_Standard.png", "~/Icons/Sigma/Extensions_32x32_Standard.png", true);

var moduleid = AddModuleToPage(auditPage, moduleDefId, "Security Analyzer",
"~/images/icon_extensions_32px.gif");
"~/Icons/Sigma/Extensions_32x32_Standard.png");

break;
}
Expand Down
5 changes: 3 additions & 2 deletions DNN.Modules.SecurityAnalyzer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@
<RootNamespace>DNN.Modules.SecurityAnalyzer</RootNamespace>
<AssemblyName>DNN.Modules.SecurityAnalyzer</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<UseIISExpress>false</UseIISExpress>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<TargetFrameworkProfile />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -147,7 +148,7 @@
<AutoAssignPort>False</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://dnndev.me/desktopmodules/SecurityAnalyzer</IISUrl>
<IISUrl>http://localhost:30900/</IISUrl>
<OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
<IISAppRootUrl>http://dnndev.me</IISAppRootUrl>
<NTLMAuthentication>False</NTLMAuthentication>
Expand Down
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("01.00.00.00")]
[assembly: AssemblyFileVersion("01.00.00.00")]
[assembly: AssemblyVersion("01.00.01.00")]
[assembly: AssemblyFileVersion("01.00.01.00")]
75 changes: 36 additions & 39 deletions SecurityAnalyzer.dnn
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="SecurityAnalyzer" type="Module" version="01.00.00">
<package name="SecurityAnalyzer" type="Module" version="01.00.01">
<friendlyName>SecurityAnalyzer</friendlyName>
<description>SecurityAnalyzer module</description>
<iconFile>Images/icon_extensions.gif</iconFile>
<iconFile>~/Icons/Sigma/Extensions_32x32_standard.png</iconFile>
<owner>
<name>DNN Software</name>
<organization>DNN Software</organization>
Expand All @@ -12,11 +12,11 @@
</owner>
<license src="License.txt"></license>
<releaseNotes src="ReleaseNotes.txt"></releaseNotes>
<azureCompatible>true</azureCompatible>
<azureCompatible>true</azureCompatible>
<dependencies>
<dependency type="CoreVersion">06.02.00</dependency>
</dependencies>

<components>
<component type="Cleanup" fileName="01.00.00.txt" version="01.00.00" />
<component type="Script">
Expand All @@ -42,8 +42,8 @@
<supportedFeatures />
<businessControllerClass>DNN.Modules.SecurityAnalyzer.Components.FeatureController</businessControllerClass>
<supportedFeatures>
<supportedFeature type="Upgradeable" />
</supportedFeatures>
<supportedFeature type="Upgradeable" />
</supportedFeatures>
<moduleDefinitions>
<moduleDefinition>
<friendlyName>SecurityAnalyzer</friendlyName>
Expand All @@ -63,41 +63,30 @@
</moduleDefinition>
</moduleDefinitions>
</desktopModule>
<eventMessage>
<processorType>DotNetNuke.Entities.Modules.EventMessageProcessor, DotNetNuke</processorType>
<processorCommand>UpgradeModule</processorCommand>
<attributes>
<businessControllerClass>DNN.Modules.SecurityAnalyzer.Components.FeatureController</businessControllerClass>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<upgradeVersionsList>01.00.00</upgradeVersionsList>
</attributes>
</eventMessage>
<eventMessage>
<processorType>DotNetNuke.Entities.Modules.EventMessageProcessor, DotNetNuke</processorType>
<processorCommand>UpgradeModule</processorCommand>
<attributes>
<businessControllerClass>DNN.Modules.SecurityAnalyzer.Components.FeatureController</businessControllerClass>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<upgradeVersionsList>01.00.00</upgradeVersionsList>
</attributes>
</eventMessage>
</component>
<component type="File">
<files>
<basePath>DesktopModules\DNNCorp\SecurityAnalyzer</basePath>
<file>
<name>License.txt</name>
</file>
<file>
<name>module.css</name>
</file>
<file>
<name>ReleaseNotes.txt</name>
</file>
<file>
<name>View.ascx</name>
</file>
<file>
<path>App_LocalResources</path>
<name>View.ascx.resx</name>
</file>

<file>
<name>SecurityAnalyzer.dnn</name>
</file>
</files>
</component>
<files>
<basePath>DesktopModules\DNNCorp\SecurityAnalyzer</basePath>
<file>
<name>License.txt</name>
</file>
<file>
<name>ReleaseNotes.txt</name>
</file>
<file>
<name>SecurityAnalyzer.dnn</name>
</file>
</files>
</component>
<component type="Assembly">
<assemblies>
<assembly>
Expand All @@ -106,6 +95,14 @@
</assembly>
</assemblies>
</component>
<component type="ResourceFile">
<resourceFiles>
<basePath>DesktopModules/DNNCorp/SecurityAnalyzer</basePath>
<resourceFile>
<name>Resources.zip</name>
</resourceFile>
</resourceFiles>
</component>
</components>
</package>
</packages>
Expand Down

0 comments on commit db49d2a

Please sign in to comment.