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

Fixes media-manager upload issue when no limit found. legacyPath option added to imagepicker()

Browse Source
This commit is contained in:
Cameron
2016-12-03 20:47:26 -08:00
parent 03a6a63694
commit 7adf8590f6
5 changed files with 59 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
e107_handlers/form_handler.php
View File

@@ -1098,7 +1098,8 @@ class e_form
{
$sc_parameters['media'] = '_common';
}
$default_thumb = $default;
$class = '';
@@ -1112,14 +1113,25 @@ class e_form
}
else
{
if('{' != $default[0])
if('{' != $default[0]) // legacy path or one without {}
{
// convert to sc path
$default_thumb = $tp->createConstants($default, 'nice');
$default = $tp->createConstants($default, 'mix');
list($default_thumb,$default) = $this->imagepickerDefault($default, $sc_parameters);
}
$default_url = $tp->replaceConstants($default, 'abs');
}
$debugInfo = "
<pre>
default-thumb: ".$default_thumb."
defautlt: ".$default."
default-url: ".$default_url."
</pre>";
// e107::getDebug()->log($debugInfo);
$blank = FALSE;
@@ -1198,7 +1210,35 @@ class e_form
}
private function imagepickerDefault($path, $parms=array())
{
$tp = e107::getParser();
if(!empty($parms['legacyPath'])) // look in a specific path.
{
$legacyDefault = rtrim($parms['legacyPath'],'/')."/".$path;
$legacyRel = $tp->replaceConstants($legacyDefault);
if(is_readable($legacyRel))
{
return array($legacyDefault, $legacyDefault);
}
else
{
// e107::getDebug()->log("Legacy Default:".$legacyDefault);
// e107::getDebug()->log("wasnt found:".$legacyRel);
}
}
$path = str_replace('e_MEDIA_IMAGE/','{e_MEDIA_IMAGE}',$path);
$default_thumb = $tp->createConstants($path, 'nice');
$default = $tp->createConstants($path, 'mix');
return array($default_thumb, $default);
}
/**