Skip to content

Commit

Permalink
Allow admin to set default gravatar type
Browse files Browse the repository at this point in the history 
see #1332
  • Loading branch information
@BurntimeX
BurntimeX committed Jun 24, 2014
1 parent 0810158 commit 956b05f
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 4 deletions.
11 changes: 11 additions & 0 deletions com.woltlab.wcf/option.xml
View file
Expand Up @@ -1014,6 +1014,17 @@ no:!cache_source_memcached_host]]></enableoptions>
<!-- /user.3rdPartyAuth -->

<!-- user.avatar -->
<option name="gravatar_default_type">
<categoryname>user.avatar</categoryname>
<optiontype>select</optiontype>
<defaultvalue><![CDATA[404]]></defaultvalue>
<selectoptions><![CDATA[404:wcf.acp.option.gravatar_default_type.404
identicon:wcf.acp.option.gravatar_default_type.identicon
wavatar:wcf.acp.option.gravatar_default_type.wavatar
monsterid:wcf.acp.option.gravatar_default_type.monsterid
retro:wcf.acp.option.gravatar_default_type.retro]]></selectoptions>
<options>module_gravatar</options>
</option>
<option name="max_avatar_width">
<categoryname>user.avatar</categoryname>
<optiontype>integer</optiontype>
Expand Down
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/avatarEdit.tpl
View file
Expand Up @@ -86,7 +86,7 @@

{if MODULE_GRAVATAR}
<dl{if $errorField == 'gravatar'} class="formError"{/if}>
<dt class="framed"><img src="https://secure.gravatar.com/avatar/{@$__wcf->user->email|strtolower|md5}?s=96" alt="" class="icon96" /></dt>
<dt class="framed"><img src="https://secure.gravatar.com/avatar/{@$__wcf->user->email|strtolower|md5}?s=96{if GRAVATAR_DEFAULT_TYPE != '404'}&amp;d={@GRAVATAR_DEFAULT_TYPE}{/if}" alt="" class="icon96" /></dt>
<dd>
<label><input type="radio" name="avatarType" value="gravatar" {if $avatarType == 'gravatar'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.gravatar{/lang}</label>
{if $errorField == 'gravatar'}
Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/acp/templates/userAdd.tpl
View file
Expand Up @@ -347,7 +347,7 @@

{if MODULE_GRAVATAR}
<dl{if $errorType[gravatar]|isset} class="formError"{/if}>
<dt class="framed"><img src="https://secure.gravatar.com/avatar/{@$user->email|strtolower|md5}?s=96" alt="" class="icon96" /></dt>
<dt class="framed"><img src="https://secure.gravatar.com/avatar/{@$user->email|strtolower|md5}?s=96{if GRAVATAR_DEFAULT_TYPE != '404'}&amp;d={@GRAVATAR_DEFAULT_TYPE}{/if}" alt="" class="icon96" /></dt>
<dd>
<label><input type="radio" name="avatarType" value="gravatar" {if $avatarType == 'gravatar'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.gravatar{/lang}</label>

Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/lib/action/GravatarDownloadAction.class.php
View file
Expand Up @@ -67,7 +67,7 @@ public function execute() {
}

// try to download new version
$gravatarURL = sprintf(Gravatar::GRAVATAR_BASE, md5(mb_strtolower($this->user->email)), $this->size, '404');
$gravatarURL = sprintf(Gravatar::GRAVATAR_BASE, md5(mb_strtolower($this->user->email)), $this->size, GRAVATAR_DEFAULT_TYPE);
try {
$tmpFile = FileUtil::downloadFileFromHttp($gravatarURL, 'gravatar');
copy($tmpFile, WCF_DIR.$cachedFilename);
Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php
View file
Expand Up @@ -93,7 +93,7 @@ public function getURL($size = null) {
* @return boolean
*/
public static function test($email) {
$gravatarURL = sprintf(self::GRAVATAR_BASE, md5(mb_strtolower($email)), 80, '404');
$gravatarURL = sprintf(self::GRAVATAR_BASE, md5(mb_strtolower($email)), 80, GRAVATAR_DEFAULT_TYPE);
try {
$tmpFile = FileUtil::downloadFileFromHttp($gravatarURL, 'gravatar');
@unlink($tmpFile);
Expand Down
7 changes: 7 additions & 0 deletions wcfsetup/install/lang/de.xml
View file
Expand Up @@ -1008,6 +1008,13 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
<item name="wcf.acp.option.user_authentication_failure_user_captcha.description"><![CDATA[TODO]]></item>
<item name="wcf.acp.option.user_authentication_failure_expiration"><![CDATA[Löschung von alten Protokolleinträgen]]></item>
<item name="wcf.acp.option.user_authentication_failure_expiration.description"><![CDATA[TODO]]></item>
<item name="wcf.acp.option.gravatar_default_type"><![CDATA[Standard Gravatar-Typ]]></item>
<item name="wcf.acp.option.gravatar_default_type.description"><![CDATA[Der <a class="externalURL" href="{@$__wcf->getPath()}acp/dereferrer.php?url=https://de.gravatar.com/site/implement/images/#default-image">Standard-Gravatar-Typ</a>, wenn einer E-Mail kein Gravatar zugeordnet werden kann.]]></item>
<item name="wcf.acp.option.gravatar_default_type.404"><![CDATA[Kein Standard-Gravatar]]></item>
<item name="wcf.acp.option.gravatar_default_type.identicon"><![CDATA[Identicon]]></item>
<item name="wcf.acp.option.gravatar_default_type.wavatar"><![CDATA[Wavatar]]></item>
<item name="wcf.acp.option.gravatar_default_type.monsterid"><![CDATA[Monster-ID]]></item>
<item name="wcf.acp.option.gravatar_default_type.retro"><![CDATA[Retro]]></item>
</category>

<category name="wcf.acp.package">
Expand Down
7 changes: 7 additions & 0 deletions wcfsetup/install/lang/en.xml
View file
Expand Up @@ -1008,6 +1008,13 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
<item name="wcf.acp.option.user_authentication_failure_user_captcha.description"><![CDATA[TODO]]></item>
<item name="wcf.acp.option.user_authentication_failure_expiration"><![CDATA[TODO: Löschung von alten Protokolleinträgen]]></item>
<item name="wcf.acp.option.user_authentication_failure_expiration.description"><![CDATA[TODO]]></item>
<item name="wcf.acp.option.gravatar_default_type"><![CDATA[Default Gravatar Type]]></item>
<item name="wcf.acp.option.gravatar_default_type.description"><![CDATA[The <a class="externalURL" href="{@$__wcf->getPath()}acp/dereferrer.php?url=https://de.gravatar.com/site/implement/images/#default-image">default Gravatar type</a> used if no matching Gravatar was found.]]></item>
<item name="wcf.acp.option.gravatar_default_type.404"><![CDATA[No default Gravatar]]></item>
<item name="wcf.acp.option.gravatar_default_type.identicon"><![CDATA[Identicon]]></item>
<item name="wcf.acp.option.gravatar_default_type.wavatar"><![CDATA[Wavatar]]></item>
<item name="wcf.acp.option.gravatar_default_type.monsterid"><![CDATA[Monster id]]></item>
<item name="wcf.acp.option.gravatar_default_type.retro"><![CDATA[Retro]]></item>
</category>

<category name="wcf.acp.package">
Expand Down

2 comments on commit 956b05f

@SoftCreatR
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@max-m
Copy link
Contributor

@max-m max-m commented on 956b05f Jun 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Please sign in to comment.