Skip to content

ENH: Avatar injection #1446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: dev
Choose a base branch
from
Draft

ENH: Avatar injection #1446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1bef4f1
ENH: Add avatar refresh feature
johnhenley Jun 13, 2025
81941c0
Merge branch 'dev' into dev91/issues/avatar-injection-1410-1411-1412
johnhenley Jun 19, 2025
e23d7ae
resync
johnhenley Jun 25, 2025
46cf7d5
resync
johnhenley Jun 26, 2025
78ccd66
resync
johnhenley Jun 26, 2025
4ccdc19
Merge branch 'dev91/issues/avatar-injection-347-1410-1411-1412' of ht…
johnhenley Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Dnn.CommunityForums/App_LocalResources/ControlPanel.ascx.fr-FR.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,6 @@
<data name="[RESX:AutoTrustLevel].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
<value>Niveau de confiance automatique</value>
</data>
<data name="[RESX:AvatarDefault].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
<value>Avatar par défaut activé</value>
</data>
<data name="[RESX:AvatarDimensions].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
<value>Dimensions de l’avatar</value>
</data>
Expand Down Expand Up @@ -979,9 +976,6 @@ Votre méthode de suppression est actuellement définie sur {0}. Vos sujets ser
<data name="[RESX:Tips:AutoSubscribe].Text" xml:space="preserve" lastModified="2024-06-09 21:35:39">
<value>Sélectionnez les rôles qui seront automatiquement souscrits et recevrez des notifications par courriel pour tout nouveau contenu publié sur ce forum.</value>
</data>
<data name="[RESX:Tips:AvatarDefault].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
<value>Activez cette option pour afficher l’avatar par défaut à partir du répertoire themes lorsqu’un utilisateur n’a pas encore spécifié d’avatar.</value>
</data>
<data name="[RESX:Tips:AvatarDimensions].Text" xml:space="preserve" lastModified="2024-05-16 15:10:43">
<value> Choisissez la hauteur et la largeur maximales des avatars</value>
</data>
Expand Down
6 changes: 0 additions & 6 deletions Dnn.CommunityForums/App_LocalResources/ControlPanel.ascx.it-IT.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,6 @@
<data name="[RESX:AutoTrustLevel].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
<value>Livello di attendibilità automatica</value>
</data>
<data name="[RESX:AvatarDefault].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
<value>Avatar predefinito abilitato</value>
</data>
<data name="[RESX:AvatarDimensions].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
<value>Dimensioni dell'avatar</value>
</data>
Expand Down Expand Up @@ -976,9 +973,6 @@ Il metodo di rimozione è attualmente impostato su {0}. I tuoi argomenti verran
<data name="[RESX:Tips:AutoSubscribe].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
<value>Seleziona i ruoli che verranno iscritti automaticamente e riceverai notifiche via e-mail per i nuovi contenuti pubblicati su questo forum.</value>
</data>
<data name="[RESX:Tips:AvatarDefault].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
<value>Attivare questa opzione per visualizzare l'avatar predefinito dalla directory dei temi quando un utente non ha ancora specificato un avatar.</value>
</data>
<data name="[RESX:Tips:AvatarDimensions].Text" xml:space="preserve" lastModified="2024-05-16 19:42:26">
<value> Scegli l'altezza e la larghezza massime per gli avatar</value>
</data>
Expand Down
6 changes: 0 additions & 6 deletions Dnn.CommunityForums/App_LocalResources/ControlPanel.ascx.nl-NL.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,6 @@
<data name="[RESX:AutoTrustLevel].Text" xml:space="preserve">
<value>Auto Niveau Vertrouwen</value>
</data>
<data name="[RESX:AvatarDefault].Text" xml:space="preserve">
<value>Standaard Avatar Ingeschakeld</value>
</data>
<data name="[RESX:AvatarDimensions].Text" xml:space="preserve">
<value>Avatar Dimensies</value>
</data>
Expand Down Expand Up @@ -1126,9 +1123,6 @@ De verwijder-methode is momenteel ingesteld op "{0}". Uw onderwerpen worden {1}
<data name="[RESX:Tips:AutoSubscribe].Text" xml:space="preserve">
<value>Selecteer de rollen welke automatisch zijn geabonneerd en welke notificatie berichten ontvangen wanneer nieuwe berichten in dit forum worden geplaatst.</value>
</data>
<data name="[RESX:Tips:AvatarDefault].Text" xml:space="preserve">
<value>Schakel deze optie in om de standaard avatar vanuit de thema directory weer te geven indien een gebruiker geen avatar heeft gespecificeerd.</value>
</data>
<data name="[RESX:Tips:AvatarDimensions].Text" xml:space="preserve">
<value> Kies de maximum hoogte en breedte voor de avatars</value>
</data>
Expand Down
6 changes: 0 additions & 6 deletions Dnn.CommunityForums/App_LocalResources/ControlPanel.ascx.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,12 +1077,6 @@
<data name="[RESX:UserNameNotFound].Text" xml:space="preserve">
<value>The username you entered was not found.</value>
</data>
<data name="[RESX:AvatarDefault].Text" xml:space="preserve">
<value>Default Avatar Enabled</value>
</data>
<data name="[RESX:Tips:AvatarDefault].Text" xml:space="preserve">
<value>Enable this option to display the default avatar from the themes directory when a user has not yet specified an avatar.</value>
</data>
<data name="[RESX:MoveDown].Text" xml:space="preserve">
<value>Move Down</value>
</data>
Expand Down
6 changes: 0 additions & 6 deletions Dnn.CommunityForums/App_LocalResources/Controlpanel.ascx.de-DE.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,6 @@
<data name="[RESX:AutoTrustLevel].Text" xml:space="preserve">
<value>Automatische Vertrauensstufe</value>
</data>
<data name="[RESX:AvatarDefault].Text" xml:space="preserve">
<value>Standard-Avatar aktiviert</value>
</data>
<data name="[RESX:AvatarDimensions].Text" xml:space="preserve">
<value>Avatar-Abmessungen</value>
</data>
Expand Down Expand Up @@ -1081,9 +1078,6 @@ Ihre Entfernungsmethode ist derzeit auf {0} eingestellt. Ihre Themen werden anh
<data name="[RESX:Tips:AutoSubscribe].Text" xml:space="preserve">
<value>Wählen Sie Rollen aus, die automatisch abonniert werden, und erhalten Sie E-Mail-Benachrichtigungen für neue Inhalte, die in diesem Forum veröffentlicht werden.</value>
</data>
<data name="[RESX:Tips:AvatarDefault].Text" xml:space="preserve">
<value>Aktivieren Sie diese Option, um den Standard-Avatar aus dem Themenverzeichnis anzuzeigen, wenn ein Benutzer noch keinen Avatar angegeben hat.</value>
</data>
<data name="[RESX:Tips:AvatarDimensions].Text" xml:space="preserve">
<value> Wählen Sie die maximale Höhe und Breite für Avatare</value>
</data>
Expand Down
6 changes: 0 additions & 6 deletions Dnn.CommunityForums/App_LocalResources/Controlpanel.ascx.es-ES.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,6 @@
<data name="[RESX:AutoTrustLevel].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
<value>Nivel de confianza automática</value>
</data>
<data name="[RESX:AvatarDefault].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
<value>Avatar predeterminado habilitado</value>
</data>
<data name="[RESX:AvatarDimensions].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
<value>Dimensiones del avatar</value>
</data>
Expand Down Expand Up @@ -976,9 +973,6 @@ El método de eliminación está configurado actualmente en {0}. Los temas se {
<data name="[RESX:Tips:AutoSubscribe].Text" xml:space="preserve" lastModified="2024-05-27 10:56:14">
<value>Seleccione los roles que se suscribirán automáticamente y recibirán notificaciones por correo para el nuevo contenido publicado en este foro.</value>
</data>
<data name="[RESX:Tips:AvatarDefault].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
<value>Habilite esta opción para mostrar el avatar predeterminado del directorio de temas cuando un usuario aún no haya especificado un avatar.</value>
</data>
<data name="[RESX:Tips:AvatarDimensions].Text" xml:space="preserve" lastModified="2024-05-16 19:52:21">
<value>Seleccione el alto y ancho máximos de los avatares</value>
</data>
Expand Down
6 changes: 6 additions & 0 deletions Dnn.CommunityForums/App_LocalResources/ForumSettings.ascx.de-DE.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,4 +495,10 @@
<data name="URLPrefixLikes.Help" xml:space="preserve">
<value>Dies ist der Text, der als Teil der URL verwendet wird, um Likes im Forum zu identifizieren.</value>
</data>
<data name="AvatarRefreshDisabled.Text" xml:space="preserve">
<value>Deaktiviert</value>
</data>
<data name="AvatarRefreshGravatar.Text" xml:space="preserve">
<value>Gravatar</value>
</data>
</root>
6 changes: 6 additions & 0 deletions Dnn.CommunityForums/App_LocalResources/ForumSettings.ascx.es-ES.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,4 +390,10 @@
<data name="URLPrefixLikes.Help" xml:space="preserve">
<value>Este es el texto que se utilizará como parte de la URL para identificar los Me gusta del foro.</value>
</data>
<data name="AvatarRefreshDisabled.Text" xml:space="preserve">
<value>Deshabilitado</value>
</data>
<data name="AvatarRefreshGravatar.Text" xml:space="preserve">
<value>Gravatar</value>
</data>
</root>
6 changes: 6 additions & 0 deletions Dnn.CommunityForums/App_LocalResources/ForumSettings.ascx.fr-FR.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,4 +390,10 @@
<data name="URLPrefixLikes.Help" xml:space="preserve">
<value>Il s’agit du texte qui sera utilisé dans le cadre de l’URL pour identifier les likes du forum.</value>
</data>
<data name="AvatarRefreshDisabled.Text" xml:space="preserve">
<value>Désactivé</value>
</data>
<data name="AvatarRefreshGravatar.Text" xml:space="preserve">
<value>Gravatar</value>
</data>
</root>
12 changes: 12 additions & 0 deletions Dnn.CommunityForums/App_LocalResources/ForumSettings.ascx.it-IT.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,4 +390,16 @@
<data name="URLPrefixLikes.Help" xml:space="preserve">
<value>Questo è il testo che verrà utilizzato come parte dell'URL per identificare i Mi piace del forum.</value>
</data>
<data name="AvatarRefreshGravatar.Text" xml:space="preserve">
<value>Gravatar</value>
</data>
<data name="AvatarRefreshType.Text" xml:space="preserve">
<value>Aggiorna avatar</value>
</data>
<data name="AvatarRefreshType.Help" xml:space="preserve">
<value>Aggiorna periodicamente gli avatar utilizzando il servizio selezionato</value>
</data>
<data name="AvatarRefreshDisabled.Text" xml:space="preserve">
<value>Disabile</value>
</data>
</root>
12 changes: 12 additions & 0 deletions Dnn.CommunityForums/App_LocalResources/ForumSettings.ascx.nl-NL.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,4 +390,16 @@
<data name="URLPrefixLikes.Help" xml:space="preserve">
<value>Dit is de tekst die zal worden gebruikt als onderdeel van de URL om forum-likes te identificeren.</value>
</data>
<data name="AvatarRefreshGravatar.Text" xml:space="preserve">
<value>Gravatar</value>
</data>
<data name="AvatarRefreshType.Text" xml:space="preserve">
<value>Avatars vernieuwen</value>
</data>
<data name="AvatarRefreshType.Help" xml:space="preserve">
<value>Vernieuwt periodiek avatars met behulp van de geselecteerde service</value>
</data>
<data name="AvatarRefreshDisabled.Text" xml:space="preserve">
<value>Uitgeschakeld</value>
</data>
</root>
12 changes: 12 additions & 0 deletions Dnn.CommunityForums/App_LocalResources/ForumSettings.ascx.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,4 +495,16 @@
<data name="URLPrefixLikes.Help" xml:space="preserve">
<value>This is the text that will be used as part of the URL to identify forum likes.</value>
</data>
<data name="AvatarRefreshType.Text" xml:space="preserve">
<value>Refresh Avatars</value>
</data>
<data name="AvatarRefreshGravatar.Text" xml:space="preserve">
<value>Gravatar</value>
</data>
<data name="AvatarRefreshType.Help" xml:space="preserve">
<value>Periodically refreshes avatars using selected service</value>
</data>
<data name="AvatarRefreshDisabled.Text" xml:space="preserve">
<value>Disabled</value>
</data>
</root>
3 changes: 3 additions & 0 deletions Dnn.CommunityForums/App_LocalResources/SharedResources.de-DE.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1841,4 +1841,7 @@ Von
<data name="[RESX:TokenReplacementException].Text" xml:space="preserve">
<value>Ausnahme: Ersetzen des Tokens für Entität: {0}-ID: {1} Tokeneigenschaft: {2} Format: {3}</value>
</data>
<data name="[RESX:GravatarRefreshed].Text" xml:space="preserve">
<value>Gravatar für Benutzer-{0} aktualisiert</value>
</data>
</root>
3 changes: 3 additions & 0 deletions Dnn.CommunityForums/App_LocalResources/SharedResources.es-ES.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1840,4 +1840,7 @@ De
<data name="[RESX:TokenReplacementException].Text" xml:space="preserve">
<value>Excepción que reemplaza el token en la entidad: {0} id: {1} propiedad del token: {2} formato: {3}</value>
</data>
<data name="[RESX:GravatarRefreshed].Text" xml:space="preserve">
<value>Gravatar actualizado para el {0} de usuario</value>
</data>
</root>
3 changes: 3 additions & 0 deletions Dnn.CommunityForums/App_LocalResources/SharedResources.fr-FR.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1837,4 +1837,7 @@ De,
<data name="[RESX:TokenReplacementException].Text" xml:space="preserve">
<value>Exception remplaçant le jeton sur l’entité : {0} id : {1} propriété du jeton : {2} format : {3}</value>
</data>
<data name="[RESX:GravatarRefreshed].Text" xml:space="preserve">
<value>Gravatar actualisé pour le {0} utilisateur</value>
</data>
</root>
3 changes: 3 additions & 0 deletions Dnn.CommunityForums/App_LocalResources/SharedResources.it-IT.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1840,4 +1840,7 @@ Da
<data name="[RESX:TokenReplacementException].Text" xml:space="preserve">
<value>Eccezione che sostituisce il token sull'entità: {0} id: {1} proprietà token: {2} formato: {3}</value>
</data>
<data name="[RESX:GravatarRefreshed].Text" xml:space="preserve">
<value>Gravatar aggiornato per l'utente {0}</value>
</data>
</root>
3 changes: 3 additions & 0 deletions Dnn.CommunityForums/App_LocalResources/SharedResources.nl-NL.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1876,4 +1876,7 @@ Van,
<data name="[RESX:TokenReplacementException].Text" xml:space="preserve">
<value>Uitzondering ter vervanging van token op entiteit: {0} id: {1} eigenschap token: {2} indeling: {3}</value>
</data>
<data name="[RESX:GravatarRefreshed].Text" xml:space="preserve">
<value>Gravatar vernieuwd voor {0} gebruiker</value>
</data>
</root>
3 changes: 3 additions & 0 deletions Dnn.CommunityForums/App_LocalResources/SharedResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1837,4 +1837,7 @@ From,
<data name="[RESX:TokenReplacementException].Text" xml:space="preserve">
<value>Exception replacing token on entity: {0} id: {1} token property: {2} format: {3}</value>
</data>
<data name="[RESX:GravatarRefreshed].Text" xml:space="preserve">
<value>Gravatar refreshed for user {0}</value>
</data>
</root>
2 changes: 2 additions & 0 deletions Dnn.CommunityForums/Classic.ascx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ protected override void OnLoad(EventArgs e)
//ForumsConfig.Sort_PermissionSets_080200();
//ForumsConfig.Upgrade_PermissionSets_090000();
//DotNetNuke.Modules.ActiveForums.Helpers.UpgradeModuleSettings.DeleteObsoleteModuleSettings_090000();
//DotNetNuke.Modules.ActiveForums.Helpers.UpgradeModuleSettings.AddAvatarModuleSettings_090100();


#endif

Expand Down
7 changes: 6 additions & 1 deletion Dnn.CommunityForums/DnnCommunityForums.dnn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,10 +424,15 @@
<name>09.00.00.SqlDataProvider</name>
<version>09.00.00</version>
</script>
<script type="Install">
<path>sql</path>
<name>09.01.00.SqlDataProvider</name>
<version>09.01.00</version>
</script>
<script type="UnInstall">
<path>sql</path>
<name>Uninstall.SqlDataProvider</name>
<version>09.00.00</version>
<version>09.01.00</version>
</script>
</scripts>
</component>
Expand Down
10 changes: 10 additions & 0 deletions Dnn.CommunityForums/Entities/ForumUserInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ public ForumUserInfo(int moduleId, DotNetNuke.Entities.Users.UserInfo userInfo)

public string UserCaption { get; set; }

public DateTime? AvatarLastRefresh { get; set; }

public DateTime? AvatarSourceLastModified { get; set; }

public int? AvatarFileId { get; set; }

[IgnoreColumn]
public DateTime? DateCreated => this.UserInfo?.CreatedOnDate;

Expand All @@ -123,8 +129,12 @@ public ForumUserInfo(int moduleId, DotNetNuke.Entities.Users.UserInfo userInfo)

public bool AttachDisabled { get; set; }

[IgnoreColumn]
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Used.")]
public string Avatar { get; set; }

[IgnoreColumn]
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Used.")]
public AvatarTypes AvatarType { get; set; }

public bool AvatarDisabled { get; set; }
Expand Down
7 changes: 7 additions & 0 deletions Dnn.CommunityForums/ForumSettings.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,13 @@
<dnn:label ID="lblAvatarSize" runat="server" resourcekey="AvatarSize" Suffix=":" />
<ul class="afavatarform"><li><%=LocalizeString("Height")%>: <asp:TextBox ID="txtAvatarHeight" runat="server" Width="75" MaxLength="3" /></li><li><%=LocalizeString("Width")%>: <asp:TextBox ID="txtAvatarWidth" runat="server" Width="75" MaxLength="3" /></li></ul>
</div>
<div class="dnnFormItem">
<dnn:label id="lblAvatarRefreshType" runat="server" resourcekey="AvatarRefreshType" suffix=":" />
<asp:dropdownlist id="drpAvatarRefreshType" runat="server">
<asp:listitem value="DISABLED" resourcekey="AvatarRefreshDisabled" />
<asp:listitem value="GRAVATAR" resourcekey="AvatarRefreshGravatar" />
</asp:dropdownlist>
</div>
<div class="dnnFormItem">
<dnn:label ID="lblSignatures" runat="server" resourcekey="UserSignatures" Suffix=":" />
<asp:DropDownList ID="drpSignatures" runat="server">
Expand Down
3 changes: 2 additions & 1 deletion Dnn.CommunityForums/ForumSettings.ascx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ public override void LoadSettings()

Utilities.SelectListItemByValue(this.drpMode, this.Mode);
Utilities.SelectListItemByValue(this.drpThemes, this.Theme);

Utilities.SelectListItemByValue(this.rdAutoLinks, this.AutoLink);
Utilities.SelectListItemByValue(this.drpAvatarRefreshType, this.AvatarRefresh);
Utilities.SelectListItemByValue(this.drpDeleteBehavior, this.DeleteBehavior);
Utilities.SelectListItemByValue(this.drpProfileVisibility, this.ProfileVisibility);
Utilities.SelectListItemByValue(this.drpSignatures, this.Signatures);
Expand Down Expand Up @@ -198,6 +198,7 @@ public override void UpdateSettings()
this.ProfileVisibility = Utilities.SafeConvertInt(this.drpProfileVisibility.SelectedValue);
this.Signatures = Utilities.SafeConvertInt(this.drpSignatures.SelectedValue);
this.UserNameDisplay = this.drpUserDisplayMode.SelectedValue;
this.AvatarRefresh = this.drpAvatarRefreshType.SelectedValue;
this.FriendlyURLs = Utilities.SafeConvertBool(this.rdEnableURLRewriter.SelectedValue);

var urlSettings = new FriendlyUrlSettings(this.PortalId);
Expand Down
8 changes: 8 additions & 0 deletions Dnn.CommunityForums/ForumSettings.ascx.designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading