Skip to content

Commit

Permalink
Merge pull request #176 from hismightiness/development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
Will Strohl authored Oct 8, 2019
2 parents a294133 + 82526d1 commit 57b2e5c
Show file tree
Hide file tree
Showing 26 changed files with 671 additions and 1,782 deletions.
2 changes: 1 addition & 1 deletion JavascriptLibraries/GA Autotrack/UV_Autotrack.dnn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<description>Automatic and enhanced Google Analytics tracking for common user interactions on the web.</description>
<iconFile>Icons\Sigma\Extensions_32x32_Standard.png</iconFile>
<owner>
<name>DNN</name>
<name>Upendo Ventures, LLC</name>
<organization>Upendo Ventures, LLC</organization>
<url>https://upendoventures.com/Support</url>
<email>[email protected]</email>
Expand Down
2 changes: 1 addition & 1 deletion Modules/WillStrohlDisqus/AboutMe.ascx.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2016, Will Strohl
* Copyright (c) 2011-2019, Will Strohl
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
Expand Down
147 changes: 147 additions & 0 deletions Modules/WillStrohlDisqus/App_LocalResources/Settings.ascx.resx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Settings.Text" xml:space="preserve">
<value>Site Migration Settings</value>
</data>
<data name="ControlTitle_settings.Text" xml:space="preserve">
<value>Disqus Module Settings</value>
</data>
<data name="lblTabIdOverride.Help" xml:space="preserve">
<value>Use only for websites that have been migrated and now have different Tab (Page) ID's. Leave empty to NOT override the ID sent to the Disqus API.</value>
</data>
<data name="lblTabIdOverride.Text" xml:space="preserve">
<value>Old Tab (Page) ID</value>
</data>
<data name="lblPortalGuidOverride.Help" xml:space="preserve">
<value>Use only for websites that have been migrated and now have a different Portal (site) GUID. Leave empty to NOT override the ID sent to the Disqus API.</value>
</data>
<data name="lblPortalGuidOverride.Text" xml:space="preserve">
<value>Old Portal (Site) GUID</value>
</data>
<data name="lblTabModuleIdOverride.Help" xml:space="preserve">
<value>Use only for websites that have been migrated and now have different TabModuleId's. Leave empty to NOT override the ID sent to the Disqus API.</value>
</data>
<data name="lblTabModuleIdOverride.Text" xml:space="preserve">
<value>Old TabModuleID</value>
</data>
<data name="rvSettings.ErrorMessage" xml:space="preserve">
<value>This value may only be an integer (e.g., 0-99999).</value>
</data>
</root>
2 changes: 1 addition & 1 deletion Modules/WillStrohlDisqus/Components/DisqusImport.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2016, Will Strohl
* Copyright (c) 2011-2019, Will Strohl
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
Expand Down
152 changes: 6 additions & 146 deletions Modules/WillStrohlDisqus/Components/FeatureController.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2016, Will Strohl
* Copyright (c) 2011-2019, Will Strohl
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
Expand Down Expand Up @@ -30,10 +30,8 @@

using System;
using System.Collections;
//using System.Data;
using System.IO;
using System.Net;
//using System.Xml;
using System.Text.RegularExpressions;
using DotNetNuke.Common.Utilities;
using DotNetNuke.Services.Exceptions;
Expand All @@ -46,7 +44,7 @@ namespace DotNetNuke.Modules.WillStrohlDisqus.Components
/// The Controller class for WillStrohlDisqus
/// </summary>
/// -----------------------------------------------------------------------------
public sealed class FeatureController /*: IPortable, ISearchable, IUpgradeable*/
public sealed class FeatureController
{

#region Constants
Expand All @@ -63,6 +61,10 @@ public sealed class FeatureController /*: IPortable, ISearchable, IUpgradeable*/

private const string DISQUS_TYPE = "DotNetNuke.Modules.WillStrohlDisqus.DisqusInfo, WillStrohlDisqus";

public const string SETTING_PORTALGUID_OVERRIDE = "PortalGuidOverride";
public const string SETTING_TABID_OVERRIDE = "TabIdOverride";
public const string SETTING_TABMODULEID_OVERRIDE = "TabModuleIdOverride";

#endregion

#region Public Methods
Expand Down Expand Up @@ -264,148 +266,6 @@ public DisqusIdentifierInfo GetIdentifier(string Identifier)

#endregion

/*
private void ExportToXml(DataTable dtSource)
{
var objDoc = new XmlDocument();
var objRoot = objDoc.CreateElement("root");
for (int i = 0; i < dtSource.Rows.Count; i++)
{
try
{
var objItem = objDoc.CreateElement("dnnBlogComments");
var dr = dtSource.Rows[i];
for (int j = 0; j < dtSource.Columns.Count; j++)
{
var objAttr = objDoc.CreateAttribute(dtSource.Columns[j].ColumnName);
objAttr.Value = String.Format("{0}", dr[j]);
objItem.Attributes.Append(objAttr);
}
objRoot.AppendChild(objItem);
}
catch
{
// do nothing
}
}
objDoc.AppendChild(objRoot);
var strFileDate = DateTime.Now.ToString("-yyyyMMddhhmmss");
this.ResponseWrite(objDoc.InnerXml, string.Format("dnnBlogComments{0}.xml", strFileDate), "text/xml");
}
public void ResponseWrite(string result, string fileName , string contentType)
{
var response = System.Web.HttpContext.Current.Response;
var lstByte = System.Text.Encoding.UTF8.GetBytes(result);
response.ClearHeaders();
response.ClearContent();
response.ContentType = String.Format("{0}; charset=utf-8", contentType);
response.AppendHeader("Content-Disposition", String.Format("attachment; filename=\"{0}\"", fileName));
response.AppendHeader("Content-Length", lstByte.Length.ToString());
response.BinaryWrite(lstByte);
response.Flush();
response.End();
}
*/

/*
#region Optional Interfaces
/// -----------------------------------------------------------------------------
/// <summary>
/// ExportModule implements the IPortable ExportModule Interface
/// </summary>
/// <param name="ModuleID">The Id of the module to be exported</param>
/// -----------------------------------------------------------------------------
public string ExportModule(int ModuleID)
{
//string strXML = "";
//List<WillStrohlDisqusInfo> colWillStrohlDisquss = GetWillStrohlDisquss(ModuleID);
//if (colWillStrohlDisquss.Count != 0)
//{
// strXML += "<WillStrohlDisquss>";
// foreach (WillStrohlDisqusInfo objWillStrohlDisqus in colWillStrohlDisquss)
// {
// strXML += "<WillStrohlDisqus>";
// strXML += "<content>" + DotNetNuke.Common.Utilities.XmlUtils.XMLEncode(objWillStrohlDisqus.Content) + "</content>";
// strXML += "</WillStrohlDisqus>";
// }
// strXML += "</WillStrohlDisquss>";
//}
//return strXML;
throw new System.NotImplementedException("The method or operation is not implemented.");
}
/// -----------------------------------------------------------------------------
/// <summary>
/// ImportModule implements the IPortable ImportModule Interface
/// </summary>
/// <param name="ModuleID">The Id of the module to be imported</param>
/// <param name="Content">The content to be imported</param>
/// <param name="Version">The version of the module to be imported</param>
/// <param name="UserId">The Id of the user performing the import</param>
/// -----------------------------------------------------------------------------
public void ImportModule(int ModuleID, string Content, string Version, int UserID)
{
//XmlNode xmlWillStrohlDisquss = DotNetNuke.Common.Globals.GetContent(Content, "WillStrohlDisquss");
//foreach (XmlNode xmlWillStrohlDisqus in xmlWillStrohlDisquss.SelectNodes("WillStrohlDisqus"))
//{
// WillStrohlDisqusInfo objWillStrohlDisqus = new WillStrohlDisqusInfo();
// objWillStrohlDisqus.ModuleId = ModuleID;
// objWillStrohlDisqus.Content = xmlWillStrohlDisqus.SelectSingleNode("content").InnerText;
// objWillStrohlDisqus.CreatedByUser = UserID;
// AddWillStrohlDisqus(objWillStrohlDisqus);
//}
throw new System.NotImplementedException("The method or operation is not implemented.");
}
/// -----------------------------------------------------------------------------
/// <summary>
/// GetSearchItems implements the ISearchable Interface
/// </summary>
/// <param name="ModInfo">The ModuleInfo for the module to be Indexed</param>
/// -----------------------------------------------------------------------------
public DotNetNuke.Services.Search.SearchItemInfoCollection GetSearchItems(DotNetNuke.Entities.Modules.ModuleInfo ModInfo)
{
//SearchItemInfoCollection SearchItemCollection = new SearchItemInfoCollection();
//List<WillStrohlDisqusInfo> colWillStrohlDisquss = GetWillStrohlDisquss(ModInfo.ModuleID);
//foreach (WillStrohlDisqusInfo objWillStrohlDisqus in colWillStrohlDisquss)
//{
// SearchItemInfo SearchItem = new SearchItemInfo(ModInfo.ModuleTitle, objWillStrohlDisqus.Content, objWillStrohlDisqus.CreatedByUser, objWillStrohlDisqus.CreatedDate, ModInfo.ModuleID, objWillStrohlDisqus.ItemId.ToString(), objWillStrohlDisqus.Content, "ItemId=" + objWillStrohlDisqus.ItemId.ToString());
// SearchItemCollection.Add(SearchItem);
//}
//return SearchItemCollection;
throw new System.NotImplementedException("The method or operation is not implemented.");
}
/// -----------------------------------------------------------------------------
/// <summary>
/// UpgradeModule implements the IUpgradeable Interface
/// </summary>
/// <param name="Version">The current version of the module</param>
/// -----------------------------------------------------------------------------
public string UpgradeModule(string Version)
{
throw new System.NotImplementedException("The method or operation is not implemented.");
}
#endregion
*/

}

}
2 changes: 1 addition & 1 deletion Modules/WillStrohlDisqus/Components/OAuthHelper.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2016, Will Strohl
* Copyright (c) 2011-2019, Will Strohl
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
Expand Down
Loading

0 comments on commit 57b2e5c

Please sign in to comment.