|
@@ -93,13 +93,8 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
|
|
|
// get profile's url
|
|
// get profile's url
|
|
|
$sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $iContentId);
|
|
$sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $iContentId);
|
|
|
|
|
|
|
|
- $sThumbUrl = $sAvatarUrl = '';
|
|
|
|
|
- if($bPublicThumb) {
|
|
|
|
|
- $sThumbUrl = $this->thumb($aData, false);
|
|
|
|
|
- $sAvatarUrl = $this->avatar($aData, false);
|
|
|
|
|
- };
|
|
|
|
|
|
|
+ $sThumbUrl = $bPublicThumb ? $this->_getUnitThumbUrl($sTemplateSize, $aData, false) : '';
|
|
|
$bThumbUrl = !empty($sThumbUrl);
|
|
$bThumbUrl = !empty($sThumbUrl);
|
|
|
- $bAvatarUrl = !empty($sAvatarUrl);
|
|
|
|
|
|
|
|
|
|
$aTmplVarsThumbnail = array(
|
|
$aTmplVarsThumbnail = array(
|
|
|
'bx_if:show_thumb_image' => array(
|
|
'bx_if:show_thumb_image' => array(
|
|
@@ -109,15 +104,8 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
|
|
|
'thumb_url' => $sThumbUrl
|
|
'thumb_url' => $sThumbUrl
|
|
|
)
|
|
)
|
|
|
),
|
|
),
|
|
|
- 'bx_if:show_avatar_image' => array(
|
|
|
|
|
- 'condition' => $bAvatarUrl,
|
|
|
|
|
- 'content' => array(
|
|
|
|
|
- 'size' => $sTemplateSize,
|
|
|
|
|
- 'avatar_url' => $sAvatarUrl
|
|
|
|
|
- )
|
|
|
|
|
- ),
|
|
|
|
|
'bx_if:show_thumb_letter' => array(
|
|
'bx_if:show_thumb_letter' => array(
|
|
|
- 'condition' => !$bThumbUrl && !$bAvatarUrl,
|
|
|
|
|
|
|
+ 'condition' => !$bThumbUrl,
|
|
|
'content' => array(
|
|
'content' => array(
|
|
|
'size' => $sTemplateSize,
|
|
'size' => $sTemplateSize,
|
|
|
'color' => implode(', ', BxDolTemplate::getColorCode($iProfile, 1.0)),
|
|
'color' => implode(', ', BxDolTemplate::getColorCode($iProfile, 1.0)),
|
|
@@ -130,7 +118,6 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
|
|
|
),
|
|
),
|
|
|
'size' => $sTemplateSize,
|
|
'size' => $sTemplateSize,
|
|
|
'thumb_url' => $bThumbUrl ? $sThumbUrl : $this->getImageUrl('no-picture-thumb.png'),
|
|
'thumb_url' => $bThumbUrl ? $sThumbUrl : $this->getImageUrl('no-picture-thumb.png'),
|
|
|
- 'avatar_url' => $bAvatarUrl ? $sAvatarUrl : $this->getImageUrl('no-picture-thumb.png'),
|
|
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
$sCoverUrl = $bPublicCover ? $this->urlCoverUnit($aData, false) : '';
|
|
$sCoverUrl = $bPublicCover ? $this->urlCoverUnit($aData, false) : '';
|
|
@@ -146,7 +133,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
|
|
|
'id' => $iContentId,
|
|
'id' => $iContentId,
|
|
|
'public' => $bPublic,
|
|
'public' => $bPublic,
|
|
|
'bx_if:show_thumbnail' => array(
|
|
'bx_if:show_thumbnail' => array(
|
|
|
- 'condition' => $bThumbUrl || $bAvatarUrl || $this->_bLetterAvatar,
|
|
|
|
|
|
|
+ 'condition' => $bThumbUrl || $this->_bLetterAvatar,
|
|
|
'content' => $aTmplVarsThumbnail
|
|
'content' => $aTmplVarsThumbnail
|
|
|
),
|
|
),
|
|
|
'cover_url' => $sCoverUrl,
|
|
'cover_url' => $sCoverUrl,
|
|
@@ -333,33 +320,51 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
|
|
|
BxDolCover::getInstance($this)->set($aVars, $sTemplateName);
|
|
BxDolCover::getInstance($this)->set($aVars, $sTemplateName);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- /**
|
|
|
|
|
|
|
+ /**
|
|
|
* Get profile picture thumb url
|
|
* Get profile picture thumb url
|
|
|
|
|
+ * @deprecated since 11.0.0 use BxBaseModProfileTemplate::urlAvatar instead.
|
|
|
*/
|
|
*/
|
|
|
function avatar ($aData, $bSubstituteNoImage = true)
|
|
function avatar ($aData, $bSubstituteNoImage = true)
|
|
|
{
|
|
{
|
|
|
- $CNF = &$this->_oConfig->CNF;
|
|
|
|
|
- return $this->_image ($CNF['FIELD_PICTURE'], $CNF['OBJECT_IMAGES_TRANSCODER_AVATAR'], 'no-picture-thumb.png', $aData, $bSubstituteNoImage);
|
|
|
|
|
|
|
+ return $this->urlAvatar($aData, $bSubstituteNoImage);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* Get profile picture thumb url
|
|
* Get profile picture thumb url
|
|
|
|
|
+ * @deprecated since 11.0.0 use BxBaseModProfileTemplate::urlThumb instead.
|
|
|
*/
|
|
*/
|
|
|
function thumb ($aData, $bSubstituteNoImage = true)
|
|
function thumb ($aData, $bSubstituteNoImage = true)
|
|
|
{
|
|
{
|
|
|
- $CNF = &$this->_oConfig->CNF;
|
|
|
|
|
- return $this->_image ($CNF['FIELD_PICTURE'], $CNF['OBJECT_IMAGES_TRANSCODER_THUMB'], 'no-picture-thumb.png', $aData, $bSubstituteNoImage);
|
|
|
|
|
|
|
+ return $this->urlThumb($aData, $bSubstituteNoImage);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * Get profile picture icon url
|
|
|
|
|
|
|
+ * Get profile picture thumb url
|
|
|
|
|
+ * @deprecated since 11.0.0 use BxBaseModProfileTemplate::urlIcon instead.
|
|
|
*/
|
|
*/
|
|
|
function icon ($aData, $bSubstituteNoImage = true)
|
|
function icon ($aData, $bSubstituteNoImage = true)
|
|
|
|
|
+ {
|
|
|
|
|
+ return $this->urlIcon($aData, $bSubstituteNoImage);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * Get profile picture icon url
|
|
|
|
|
+ */
|
|
|
|
|
+ function urlIcon ($aData, $bSubstituteNoImage = true)
|
|
|
{
|
|
{
|
|
|
$CNF = &$this->_oConfig->CNF;
|
|
$CNF = &$this->_oConfig->CNF;
|
|
|
return $this->_image ($CNF['FIELD_PICTURE'], $CNF['OBJECT_IMAGES_TRANSCODER_ICON'], 'no-picture-icon.png', $aData, $bSubstituteNoImage);
|
|
return $this->_image ($CNF['FIELD_PICTURE'], $CNF['OBJECT_IMAGES_TRANSCODER_ICON'], 'no-picture-icon.png', $aData, $bSubstituteNoImage);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * Get profile thumb url
|
|
|
|
|
+ */
|
|
|
|
|
+ function urlThumb ($aData, $bSubstituteNoImage = true)
|
|
|
|
|
+ {
|
|
|
|
|
+ $CNF = &$this->_oConfig->CNF;
|
|
|
|
|
+ return $this->_image ($CNF['FIELD_PICTURE'], $CNF['OBJECT_IMAGES_TRANSCODER_THUMB'], 'no-picture-thumb.png', $aData, $bSubstituteNoImage);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* Get profile avatar url
|
|
* Get profile avatar url
|
|
|
*/
|
|
*/
|
|
@@ -396,19 +401,19 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
|
|
|
|
|
|
|
|
$sImageUrl = $this->_image($CNF['FIELD_COVER'], $CNF['OBJECT_IMAGES_TRANSCODER_COVER'], '', $aData, false);
|
|
$sImageUrl = $this->_image($CNF['FIELD_COVER'], $CNF['OBJECT_IMAGES_TRANSCODER_COVER'], '', $aData, false);
|
|
|
if($sImageUrl === false) {
|
|
if($sImageUrl === false) {
|
|
|
- $iImageId = (int)getParam('sys_site_cover_common');
|
|
|
|
|
- $oImageTranscoder = BxDolTranscoderImage::getObjectInstance(BX_DOL_TRANSCODER_OBJ_COVER);
|
|
|
|
|
- if($oImageTranscoder && $iImageId != 0)
|
|
|
|
|
- $sImageUrl = $oImageTranscoder->getFileUrl($iImageId);
|
|
|
|
|
|
|
+ $iImageId = (int)getParam('sys_site_cover_common');
|
|
|
|
|
+ $oImageTranscoder = BxDolTranscoderImage::getObjectInstance(BX_DOL_TRANSCODER_OBJ_COVER);
|
|
|
|
|
+ if($oImageTranscoder && $iImageId != 0)
|
|
|
|
|
+ $sImageUrl = $oImageTranscoder->getFileUrl($iImageId);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if($bSubstituteNoImage && !$sImageUrl)
|
|
if($bSubstituteNoImage && !$sImageUrl)
|
|
|
- $sImageUrl = $this->getImageUrl('cover.jpg');
|
|
|
|
|
|
|
+ $sImageUrl = $this->getImageUrl('cover.jpg');
|
|
|
|
|
|
|
|
- return $sImageUrl;
|
|
|
|
|
|
|
+ return $sImageUrl;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- /**
|
|
|
|
|
|
|
+ /**
|
|
|
* Get profile cover image url for browse unit
|
|
* Get profile cover image url for browse unit
|
|
|
*/
|
|
*/
|
|
|
function urlCoverUnit ($aData, $bSubstituteNoImage = true)
|
|
function urlCoverUnit ($aData, $bSubstituteNoImage = true)
|
|
@@ -464,7 +469,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
|
|
|
$sResult = $this->_sUnitClassShowCase;
|
|
$sResult = $this->_sUnitClassShowCase;
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
- case 'unit_wo_info_showcase.html':
|
|
|
|
|
|
|
+ case 'unit_wo_info_showcase.html':
|
|
|
$sResult = $this->_sUnitClassWoInfoShowCase;
|
|
$sResult = $this->_sUnitClassWoInfoShowCase;
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
@@ -488,6 +493,16 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
|
|
|
|
|
|
|
|
return $sResult;
|
|
return $sResult;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ protected function _getUnitThumbUrl($sSize, $aData, $bSubstituteNoImage = true)
|
|
|
|
|
+ {
|
|
|
|
|
+ $sMethod = 'url' . bx_gen_method_name(str_replace('ava', 'avatar', $sSize), array('_', '-'));
|
|
|
|
|
+
|
|
|
|
|
+ if(method_exists($this, $sMethod))
|
|
|
|
|
+ return $this->$sMethod($aData, $bSubstituteNoImage);
|
|
|
|
|
+ else
|
|
|
|
|
+ return $this->_getUnitThumbUrl($this->_sUnitSizeDefault, $aData, $bSubstituteNoImage);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/** @} */
|
|
/** @} */
|