1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 11:36:08 +02:00

Upgrade Fixes - Legacy Download image paths and Download Category icons.

This commit is contained in:
Cameron
2016-12-05 15:41:19 -08:00
parent 11a90dcbbb
commit e6be1b8a2c
4 changed files with 56 additions and 13 deletions

View File

@@ -4340,7 +4340,7 @@ class e_form
$value = '<a href="'.$url.'" title="Direct link to '.$name.'" rel="external">'.$name.'</a>';
break;
case 'image': //TODO - thumb, js tooltip...
case 'image': //js tooltip...
if($value)
{
@@ -4396,13 +4396,27 @@ class e_form
{
$thparms['aw'] = intval($parms['thumb_aw']);
}
if(!empty($parms['legacyPath']))
{
$thparms['legacy'] = $parms['legacyPath'];
$parms['pre'] = rtrim($parms['legacyPath'],'/').'/';
}
// return print_a($thparms,true);
$src = $tp->replaceConstants(vartrue($parms['pre']).$value, 'abs');
$thsrc = $tp->thumbUrl(vartrue($parms['pre']).$value, $thparms, varset($parms['thumb_urlraw']));
$alt = basename($src);
$ttl = '<img src="'.$thsrc.'" alt="'.$alt.'" class="thumbnail e-thumb" />';
// $ttl = '<img src="'.$thsrc.'" alt="'.$alt.'" class="thumbnail e-thumb" />';
$thparms['alt'] = $alt;
$thparms['class'] = "thumbnail e-thumb";
$ttl = $tp->toImage(vartrue($parms['pre']).$value, $thparms);
e107::getDebug()->log($value);
e107::getDebug()->log($thparms);
$value = '<a href="'.$src.'" data-modal-caption="'.$alt.'" data-target="#uiModal" class="e-modal e-image-preview" title="'.$alt.'" rel="external">'.$ttl.'</a>';
}
else
@@ -4419,7 +4433,7 @@ class e_form
$ret = '<ol>';
for ($i=0; $i < 5; $i++)
{
$k = $key.'['.$i.'][path]';
//$k = $key.'['.$i.'][path]';
$ival = $value[$i]['path'];
$ret .= '<li>'.$ival.'</li>';
}