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

Custom Fields fixes.

Browse Source
This commit is contained in:
Cameron 2017-01-25 10:30:28 -08:00
parent 46cacf5e3f
commit d776d116dc
3 changed files with 11 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/cpage.php
View File

@ -252,6 +252,8 @@ class page_chapters_ui extends e_admin_ui
e107::getMessage()->addError(CUSLAN_57);
return false;
}
$new_data = e107::getCustomFields()->processConfigPost('chapter_fields', $new_data);
return $new_data;
}

88
e107_core/shortcodes/batch/page_shortcodes.php
View File

@ -34,10 +34,6 @@ class cpage_shortcodes extends e_shortcode
{
$id = $row['chapter_id'];
if(!empty($row['chapter_fields']))
{
$row['chapter_fields'] = e107::unserialize($row['chapter_fields']);
}
$this->chapterData[$id] = $row;
}
@ -45,7 +41,7 @@ class cpage_shortcodes extends e_shortcode
}
// Set Chapter. // @see chapter_menu.php
public function setChapter($id)
@ -639,90 +635,10 @@ class cpage_shortcodes extends e_shortcode
return null;
}
$tp = e107::getParser();
$chap = $this->var['page_chapter'];
$key = $parm['name'];
$fields = $this->chapterData[$chap]['chapter_fields'];
$fieldData = e107::unserialize($this->var['page_fields']);
$raw = (!empty($parm['mode']) && $parm['mode'] === 'raw') ? true : false;
$type = (!empty($parm['type'])) ? $parm['type'] : null;
$fieldType = $fields[$key]['type'];
// print_a($fields);
// @todo Move this part to form_handler or e_parse somewhere.
if(isset($fieldData[$key]))
{
$value = $fieldData[$key];
switch($fieldType)
{
case "dropdown":
case "checkboxes":
case "radio":
return ($raw) ? $value : e107::getForm()->renderValue($key,$value,$fields[$key]);
break;
case "image":
return ($raw) ? $tp->thumbUrl($value) : $tp->toImage($value);
break;
case "icon":
return ($raw) ? str_replace(".glyph", '', $value) : $tp->toIcon($value);
break;
case "country":
return ($raw) ? $value : e107::getForm()->getCountry($value);
break;
case "tags":
return ($raw) ? $value : $tp->toLabel($value,$type);
break;
case "lanlist":
case "language":
return ($raw) ? $value : e107::getLanguage()->convert($value);
break;
case "datestamp":
return ($raw) ? $value : $tp->toDate($value);
break;
case "file":
return ($raw) ? $tp->toFile($value, array('raw'=>1)) : $tp->toFile($value);
break;
case "url":
case "email":
return ($raw) ? $value : $tp->toHtml($value);
break;
case "user":
return ($raw) ? $value : e107::getSystemUser($value,true)->getName();
break;
case "userclass":
return ($raw) ? $value : e107::getUserClass()->getName($value);
break;
case "textarea":
case "bbarea":
return $tp->toHtml($value, true);
break;
default:
return $tp->toHtml($value);
}
}
return e107::getCustomFields()->loadConfig($fields)->loadData($this->var['page_fields'])->getFieldValue($parm['name'],$parm);
}

12
e107_handlers/e_customfields_class.php
View File

@ -55,6 +55,8 @@
$this->_config = e107::unserialize($data);
e107::getDebug()->log($this->_config);
return $this;
}
@ -311,11 +313,10 @@
$ui->addTab($tabKey, $this->_tab[$tabKey]);
foreach($this->_config as $k=>$fld)
foreach($this->_config as $key=>$fld)
{
$fld['tab'] = $tabKey;
$fld['data'] = false;
$key = $fld['key'];
if($fld['type'] === 'icon')
{
@ -380,10 +381,9 @@
return $postData;
}
$newdata = $postData[$fieldname];
$new = array();
foreach($newdata as $fields)
foreach($postData[$fieldname] as $fields)
{
if(empty($fields['key']) || empty($fields['type']))
{
@ -398,7 +398,9 @@
}
return $new;
$postData[$fieldname] = $new;
return $postData;
}