mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-18 12:21:45 +02:00
Code Issues Releases Wiki Activity

Avatar path corrections.

Browse Source
This commit is contained in:
Cameron
2013-04-19 22:50:41 -07:00
parent 42c47b7742
commit 1500effbd7
13 changed files with 78 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_core/shortcodes/single/picture.sc
View File

@@ -24,11 +24,5 @@ else
{
$image = USERPHOTO;
}
if($image && file_exists(e_MEDIA_AVATAR.$image))
{
return "<img src='".e_MEDIA_AVATAR_ABS."{$image}' alt='' />";
}
else
{
return "";
}
return e107::getParser()->parseTemplate("{USER_AVATAR=".$image."}",true);

27
e107_core/shortcodes/single/user_avatar.php
View File

@@ -42,16 +42,31 @@ function user_avatar_shortcode($parm='')
if (vartrue($image))
{
$img = (strpos($image,"://")!==false) ? $image : $tp->thumbUrl(e_MEDIA."avatars/".$image,"w=".$width."&h=".$height);
$text = "<img class='user-avatar e-tip' src='".$img."' alt='' style='width:".$width."px; height:".$height."px' />
";
if(strpos($image,"://")!==false) // Remove Image
{
$img = $image;
}
elseif(file_exists(e_AVATAR_DEFAULT.$image)) // Local Default Image
{
$img = $tp->thumbUrl(e_AVATAR_DEFAULT.$image,"w=".$width."&h=".$height,true);
}
elseif(file_exists(e_AVATAR_UPLOAD.$image)) // User-Uplaoded Image
{
$img = $tp->thumbUrl(e_AVATAR_UPLOAD.$image,"w=".$width."&h=".$height,true);
}
else // Image Missing.
{
$img = $tp->thumbUrl(e_IMAGE."generic/blank_avatar.jpg","w=".$width."&h=".$height,true);
}
}
else
else // No image provided - so send generic.
{
$img = $tp->thumbUrl(e_IMAGE."generic/blank_avatar.jpg","w=".$width."&h=".$height);
$text = "<img class='user-avatar' src='".$img."' alt='' />";
$img = $tp->thumbUrl(e_IMAGE."generic/blank_avatar.jpg","w=".$width."&h=".$height,true);
}
$text = "<img class='user-avatar e-tip' src='".$img."' alt='' style='width:".$width."px; height:".$height."px' />";
// return $img;
return $text;
}