Using format_avatar to format avatars.

MyBBStuff · Nov 30, 2014 · 474616f · 474616f
1 parent 885bba1
commit 474616f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 19 deletions.
diff --git a/inc/languages/english/admin/myalerts.lang.php b/inc/languages/english/admin/myalerts.lang.php
@@ -13,8 +13,8 @@
 $l['setting_myalerts_dropdown_limit_desc'] = "How many alerts do you wish to display in the global alerts dropdown? (default is 5)";
 $l['setting_myalerts_autorefresh'] = "MyAlerts page AJAX autorefresh";
 $l['setting_myalerts_autorefresh_desc'] = "How often (in seconds) do you wish the MyAlerts page to refresh the alerts listing via AJAX? (0 for no autorefresh)";
-$l['setting_myalerts_default_avatar'] = "Default Avatar URL";
-$l['setting_myalerts_default_avatar_desc'] = "Specify a URL to an image to use as the default avatar in MyAlerts for users without an avatar set.";
+$l['setting_myalerts_avatar_size'] = "Avatar Dimensions";
+$l['setting_myalerts_default_avatar_desc'] = "The dimensions to use when displaying avatars in alert listings. In the form x|y. Example: 64|64.";
 
 $l['myalerts_task_cleanup_ran'] = 'Read alerts over a week old were deleted successfully!';
 $l['myalerts_task_cleanup_error'] = 'Something went wrong while cleaning up the alerts...';

diff --git a/inc/plugins/MybbStuff/MyAlerts/templates/alert_row.html b/inc/plugins/MybbStuff/MyAlerts/templates/alert_row.html
@@ -1,8 +1,7 @@
 <tr class="alert-row alert--{$alert['alert_code']} {$alert['alert_status']}" id="alert_row_{$alert['id']}">
     <td class="{$altbg}" width="50">
-        <a class="avatar" href="{$alert['from_user_raw_profilelink']}"><img src="{$alert['avatar']}"
-                                                                            alt="{$alert['username']}'s avatar"
-                                                                            width="48" height="48"/></a>
+        <a class="avatar" href="{$alert['from_user_raw_profilelink']}"><img src="{$alert['avatar']['image']}"
+                                                                            alt="{$alert['username']}'s avatar" {$alert['avatar']['width_height']}/></a>
     </td>
     <td class="{$altbg}">
         <a href="{$mybb->settings['bburl']}/alerts.php?action=view&amp;id={$alert['id']}">

diff --git a/inc/plugins/MybbStuff/MyAlerts/templates/alert_row_popup.html b/inc/plugins/MybbStuff/MyAlerts/templates/alert_row_popup.html
@@ -1,8 +1,7 @@
 <tr class="alert {$alert['alert_status']} alert--{$alert['alert_code']}" id="alert_row_popup_{$alert['id']}">
     <td class="{$altbg}" class="align-center alert__avatar" align="center">
-        <a class="avatar" href="{$alert['from_user_raw_profilelink']}"><img src="{$alert['avatar']}"
-                                                                            alt="{$alert['username']}'s avatar"
-                                                                            width="24" height="24"/></a>
+        <a class="avatar" href="{$alert['from_user_raw_profilelink']}"><img src="{$alert['avatar']['image']}"
+                                                                            alt="{$alert['username']}'s avatar" {$alert['avatar']['width_height']}/></a>
     </td>
     <td class="{$altbg} alert__content">
         <a href="{$mybb->settings['bburl']}/alerts.php?action=view&amp;id={$alert['id']}">

diff --git a/inc/plugins/myalerts.php b/inc/plugins/myalerts.php
@@ -199,11 +199,11 @@ function myalerts_activate()
                 'value' => '0',
                 'optionscode' => 'text',
             ),
-            'default_avatar' => array(
-                'title' => $lang->setting_myalerts_default_avatar,
-                'description' => $lang->setting_myalerts_default_avatar_desc,
+            'avatar_size' => array(
+                'title' => $lang->setting_myalerts_avatar_size,
+                'description' => $lang->setting_myalerts_avatar_size_desc,
                 'optionscode' => 'text',
-                'value' => './images/alerts/default-avatar.png',
+                'value' => '64|64',
             ),
         )
     );
@@ -375,13 +375,10 @@ function parse_alert(MybbStuff_MyAlerts_Entity_Alert $alertToParse)
 
         $fromUser = $alertToParse->getFromUser();
 
-        if (empty($fromUser['avatar'])) {
-            $outputAlert['avatar'] = htmlspecialchars_uni($mybb->get_asset_url($mybb->settings['myalerts_default_avatar']
-                )
-            );
-        } else {
-            $outputAlert['avatar'] = htmlspecialchars_uni($mybb->get_asset_url($fromUser['avatar']));
-        }
+        $maxDimensions = str_replace('|', 'x', $mybb->settings['myalerts_avatar_size']);
+
+        $outputAlert['avatar'] = format_avatar($fromUser['avatar'], $mybb->settings['myalerts_avatar_size'], $maxDimensions);
+        $outputAlert['avatar']['image'] = htmlspecialchars_uni($outputAlert['avatar']['image']);
 
         $outputAlert['id'] = $alertToParse->getId();
         $outputAlert['from_user'] = format_name(